diff --git a/neon/needles/calamares-installer-disk-20200504.json b/neon/needles/calamares-installer-disk-20200504.json
new file mode 100644
index 0000000..f095327
--- /dev/null
+++ b/neon/needles/calamares-installer-disk-20200504.json
@@ -0,0 +1,36 @@
+{
+  "area": [
+    {
+      "ypos": 84,
+      "xpos": 199,
+      "type": "match",
+      "width": 625,
+      "height": 53
+    },
+    {
+      "xpos": 201,
+      "ypos": 141,
+      "width": 77,
+      "height": 174,
+      "type": "match"
+    },
+    {
+      "xpos": 240,
+      "ypos": 142,
+      "width": 253,
+      "height": 17,
+      "type": "match"
+    },
+    {
+      "xpos": 202,
+      "ypos": 390,
+      "width": 203,
+      "height": 61,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-disk"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-disk-20200504.png b/neon/needles/calamares-installer-disk-20200504.png
new file mode 100644
index 0000000..f2d238a
Binary files /dev/null and b/neon/needles/calamares-installer-disk-20200504.png differ
diff --git a/neon/needles/calamares-installer-disk-erase-selected-20200504.json b/neon/needles/calamares-installer-disk-erase-selected-20200504.json
new file mode 100644
index 0000000..c568867
--- /dev/null
+++ b/neon/needles/calamares-installer-disk-erase-selected-20200504.json
@@ -0,0 +1,57 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 198,
+      "ypos": 318,
+      "height": 59,
+      "width": 641
+    },
+    {
+      "xpos": 200,
+      "ypos": 398,
+      "type": "match",
+      "width": 276,
+      "height": 58
+    },
+    {
+      "height": 25,
+      "width": 114,
+      "type": "match",
+      "ypos": 457,
+      "xpos": 271
+    },
+    {
+      "xpos": 202,
+      "ypos": 34,
+      "type": "match",
+      "width": 364,
+      "height": 50
+    },
+    {
+      "type": "match",
+      "ypos": 42,
+      "xpos": 626,
+      "height": 39,
+      "width": 162
+    },
+    {
+      "ypos": 89,
+      "xpos": 200,
+      "type": "match",
+      "width": 671,
+      "height": 48
+    },
+    {
+      "xpos": 201,
+      "ypos": 145,
+      "width": 76,
+      "height": 54,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-disk-erase-selected"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-disk-erase-selected-20200504.png b/neon/needles/calamares-installer-disk-erase-selected-20200504.png
new file mode 100644
index 0000000..25e57dc
Binary files /dev/null and b/neon/needles/calamares-installer-disk-erase-selected-20200504.png differ
diff --git a/neon/needles/calamares-installer-icon-20200430.json b/neon/needles/calamares-installer-icon-20200430.json
new file mode 100644
index 0000000..1396419
--- /dev/null
+++ b/neon/needles/calamares-installer-icon-20200430.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 40,
+      "height": 48,
+      "xpos": 37,
+      "ypos": 15,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-icon"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-icon-20200430.png b/neon/needles/calamares-installer-icon-20200430.png
new file mode 100644
index 0000000..df2226b
Binary files /dev/null and b/neon/needles/calamares-installer-icon-20200430.png differ
diff --git a/neon/needles/calamares-installer-keyboard-20200504.json b/neon/needles/calamares-installer-keyboard-20200504.json
new file mode 100644
index 0000000..51da621
--- /dev/null
+++ b/neon/needles/calamares-installer-keyboard-20200504.json
@@ -0,0 +1,36 @@
+{
+  "area": [
+    {
+      "width": 43,
+      "height": 44,
+      "xpos": 342,
+      "ypos": 145,
+      "type": "match"
+    },
+    {
+      "xpos": 315,
+      "ypos": 265,
+      "width": 322,
+      "height": 22,
+      "type": "match"
+    },
+    {
+      "xpos": 201,
+      "ypos": 403,
+      "width": 117,
+      "height": 16,
+      "type": "match"
+    },
+    {
+      "xpos": 616,
+      "ypos": 334,
+      "width": 111,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-keyboard"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-keyboard-20200504.png b/neon/needles/calamares-installer-keyboard-20200504.png
new file mode 100644
index 0000000..4b53a0d
Binary files /dev/null and b/neon/needles/calamares-installer-keyboard-20200504.png differ
diff --git a/neon/needles/calamares-installer-next-nohighlight-20200430.json b/neon/needles/calamares-installer-next-nohighlight-20200430.json
new file mode 100644
index 0000000..7c4cc55
--- /dev/null
+++ b/neon/needles/calamares-installer-next-nohighlight-20200430.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 41,
+      "width": 93,
+      "type": "match",
+      "xpos": 830,
+      "ypos": 495
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-next",
+    "calamares-installer-next-nohighlight"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-next-nohighlight-20200430.png b/neon/needles/calamares-installer-next-nohighlight-20200430.png
new file mode 100644
index 0000000..31ab8f6
Binary files /dev/null and b/neon/needles/calamares-installer-next-nohighlight-20200430.png differ
diff --git a/neon/needles/calamares-installer-restart-20191211.json b/neon/needles/calamares-installer-restart-20191211.json
new file mode 100644
index 0000000..0a7187a
--- /dev/null
+++ b/neon/needles/calamares-installer-restart-20191211.json
@@ -0,0 +1,44 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 461,
+      "ypos": 194,
+      "height": 31,
+      "width": 286
+    },
+    {
+      "xpos": 541,
+      "type": "match",
+      "ypos": 320,
+      "width": 120,
+      "height": 50
+    },
+    {
+      "ypos": 274,
+      "type": "match",
+      "xpos": 298,
+      "height": 21,
+      "width": 179
+    },
+    {
+      "width": 219,
+      "height": 15,
+      "type": "match",
+      "xpos": 578,
+      "ypos": 258
+    },
+    {
+      "ypos": 503,
+      "type": "match",
+      "xpos": 928,
+      "width": 92,
+      "height": 45
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-restart",
+    "calamares-installer-restart-now"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-restart-20191211.png b/neon/needles/calamares-installer-restart-20191211.png
new file mode 100644
index 0000000..a2c686d
Binary files /dev/null and b/neon/needles/calamares-installer-restart-20191211.png differ
diff --git a/neon/needles/calamares-installer-timezone-20200504.json b/neon/needles/calamares-installer-timezone-20200504.json
new file mode 100644
index 0000000..03ab54a
--- /dev/null
+++ b/neon/needles/calamares-installer-timezone-20200504.json
@@ -0,0 +1,34 @@
+{
+  "area": [
+    {
+      "ypos": 398,
+      "xpos": 199,
+      "type": "match",
+      "width": 812,
+      "height": 38
+    },
+    {
+      "height": 40,
+      "width": 818,
+      "type": "match",
+      "ypos": 439,
+      "xpos": 195
+    },
+    {
+      "width": 441,
+      "height": 297,
+      "xpos": 540,
+      "ypos": 54,
+      "type": "match"
+    }
+  ],
+  "properties": [
+    {
+      "name": "workaround",
+      "value": "comboboxes layout is broken so scaling is off"
+    }
+  ],
+  "tags": [
+    "calamares-installer-timezone"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-timezone-20200504.png b/neon/needles/calamares-installer-timezone-20200504.png
new file mode 100644
index 0000000..2dbb91f
Binary files /dev/null and b/neon/needles/calamares-installer-timezone-20200504.png differ
diff --git a/neon/needles/calamares-installer-user-user-20200504.json b/neon/needles/calamares-installer-user-user-20200504.json
new file mode 100644
index 0000000..129c1d1
--- /dev/null
+++ b/neon/needles/calamares-installer-user-user-20200504.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "ypos": 315,
+      "height": 20,
+      "type": "match",
+      "width": 151,
+      "xpos": 196
+    },
+    {
+      "height": 270,
+      "type": "match",
+      "width": 234,
+      "xpos": 195,
+      "ypos": 36
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-user-user"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-user-user-20200504.png b/neon/needles/calamares-installer-user-user-20200504.png
new file mode 100644
index 0000000..b5385af
Binary files /dev/null and b/neon/needles/calamares-installer-user-user-20200504.png differ
diff --git a/neon/needles/calamares-installer-welcome-20200430.json b/neon/needles/calamares-installer-welcome-20200430.json
new file mode 100644
index 0000000..edd4113
--- /dev/null
+++ b/neon/needles/calamares-installer-welcome-20200430.json
@@ -0,0 +1,50 @@
+{
+  "area": [
+    {
+      "xpos": 6,
+      "ypos": 128,
+      "type": "match",
+      "width": 145,
+      "height": 395
+    },
+    {
+      "type": "match",
+      "xpos": 42,
+      "ypos": 35,
+      "height": 79,
+      "width": 104
+    },
+    {
+      "type": "match",
+      "xpos": 272,
+      "ypos": 112,
+      "height": 37,
+      "width": 336
+    },
+    {
+      "ypos": 369,
+      "xpos": 287,
+      "type": "match",
+      "width": 185,
+      "height": 56
+    },
+    {
+      "xpos": 352,
+      "ypos": 164,
+      "type": "match",
+      "width": 504,
+      "height": 12
+    },
+    {
+      "type": "match",
+      "xpos": 195,
+      "ypos": 181,
+      "height": 180,
+      "width": 768
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-welcome"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-welcome-20200430.png b/neon/needles/calamares-installer-welcome-20200430.png
new file mode 100644
index 0000000..77d6453
Binary files /dev/null and b/neon/needles/calamares-installer-welcome-20200430.png differ
diff --git a/neon/needles/calamares-installer-welcome-offline-20191214.json b/neon/needles/calamares-installer-welcome-offline-20191214.json
new file mode 100644
index 0000000..5e946bd
--- /dev/null
+++ b/neon/needles/calamares-installer-welcome-offline-20191214.json
@@ -0,0 +1,53 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 145,
+      "height": 395,
+      "xpos": 22,
+      "ypos": 129
+    },
+    {
+      "width": 125,
+      "type": "match",
+      "xpos": 31,
+      "height": 64,
+      "ypos": 46
+    },
+    {
+      "ypos": 110,
+      "xpos": 273,
+      "height": 41,
+      "type": "match",
+      "width": 336
+    },
+    {
+      "type": "match",
+      "width": 129,
+      "height": 46,
+      "xpos": 282,
+      "ypos": 396
+    },
+    {
+      "xpos": 271,
+      "height": 16,
+      "ypos": 160,
+      "type": "match",
+      "width": 441
+    },
+    {
+      "type": "match",
+      "width": 469,
+      "xpos": 281,
+      "height": 31,
+      "ypos": 228
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-installer-welcome-offline",
+    "calamares-installer-welcome",
+    "ENV-OFFLINE",
+    "ENV-SERIES-bionic"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-installer-welcome-offline-20191214.png b/neon/needles/calamares-installer-welcome-offline-20191214.png
new file mode 100644
index 0000000..e52d9c7
Binary files /dev/null and b/neon/needles/calamares-installer-welcome-offline-20191214.png differ
diff --git a/neon/needles/calamares-oem-user-complete-20191213.json b/neon/needles/calamares-oem-user-complete-20191213.json
new file mode 100644
index 0000000..b4ef708
--- /dev/null
+++ b/neon/needles/calamares-oem-user-complete-20191213.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "width": 579,
+      "xpos": 195,
+      "height": 312,
+      "ypos": 39
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "calamares-oem-user-complete"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/calamares-oem-user-complete-20191213.png b/neon/needles/calamares-oem-user-complete-20191213.png
new file mode 100644
index 0000000..d716ec0
Binary files /dev/null and b/neon/needles/calamares-oem-user-complete-20191213.png differ
diff --git a/neon/needles/live-desktop-20200430.json b/neon/needles/live-desktop-20200430.json
new file mode 100644
index 0000000..4f535eb
--- /dev/null
+++ b/neon/needles/live-desktop-20200430.json
@@ -0,0 +1,29 @@
+{
+  "area": [
+    {
+      "height": 33,
+      "width": 645,
+      "type": "match",
+      "xpos": 0,
+      "ypos": 735
+    },
+    {
+      "xpos": 807,
+      "ypos": 734,
+      "type": "match",
+      "width": 28,
+      "height": 33
+    },
+    {
+      "height": 725,
+      "width": 919,
+      "type": "match",
+      "ypos": 0,
+      "xpos": 105
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "live-desktop"
+  ]
+}
\ No newline at end of file
diff --git a/neon/needles/live-desktop-20200430.png b/neon/needles/live-desktop-20200430.png
new file mode 100644
index 0000000..14d8698
Binary files /dev/null and b/neon/needles/live-desktop-20200430.png differ