diff --git a/needles/anaconda_install_done-gtk3197bug.json b/needles/anaconda_install_done-gtk3197bug.json
new file mode 100644
index 00000000..a063b186
--- /dev/null
+++ b/needles/anaconda_install_done-gtk3197bug.json
@@ -0,0 +1,24 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "type": "match",
+      "width": 322,
+      "height": 16,
+      "xpos": 695,
+      "ypos": 636
+    },
+    {
+      "xpos": 1000,
+      "type": "match",
+      "height": 28,
+      "width": 17,
+      "ypos": 678
+    }
+  ],
+  "tags": [
+    "anaconda_install_done",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_done-gtk3197bug.png b/needles/anaconda_install_done-gtk3197bug.png
new file mode 100644
index 00000000..f3671aef
Binary files /dev/null and b/needles/anaconda_install_done-gtk3197bug.png differ
diff --git a/needles/anaconda_install_done_french-gtk3197bug.json b/needles/anaconda_install_done_french-gtk3197bug.json
new file mode 100644
index 00000000..f1962e5b
--- /dev/null
+++ b/needles/anaconda_install_done_french-gtk3197bug.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "ypos": 636,
+      "width": 408,
+      "type": "match",
+      "height": 16,
+      "xpos": 610
+    },
+    {
+      "type": "match",
+      "height": 28,
+      "xpos": 1000,
+      "width": 17,
+      "ypos": 678
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_install_done",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_done_french-gtk3197bug.png b/needles/anaconda_install_done_french-gtk3197bug.png
new file mode 100644
index 00000000..2bf197f3
Binary files /dev/null and b/needles/anaconda_install_done_french-gtk3197bug.png differ
diff --git a/needles/anaconda_install_user_creation_screen-cantarell21.json b/needles/anaconda_install_user_creation_screen-cantarell21.json
new file mode 100644
index 00000000..7bdcb67e
--- /dev/null
+++ b/needles/anaconda_install_user_creation_screen-cantarell21.json
@@ -0,0 +1,32 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "type": "match",
+      "xpos": 258,
+      "height": 17,
+      "width": 69,
+      "ypos": 153
+    },
+    {
+      "ypos": 280,
+      "type": "match",
+      "height": 17,
+      "width": 62,
+      "xpos": 267
+    },
+    {
+      "ypos": 43,
+      "type": "match",
+      "width": 63,
+      "height": 27,
+      "xpos": 7
+    }
+  ],
+  "tags": [
+    "anaconda_install_user_creation_screen",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_screen-cantarell21.png b/needles/anaconda_install_user_creation_screen-cantarell21.png
new file mode 100644
index 00000000..4081a575
Binary files /dev/null and b/needles/anaconda_install_user_creation_screen-cantarell21.png differ
diff --git a/needles/anaconda_install_user_creation_screen_french-cantarell21.json b/needles/anaconda_install_user_creation_screen_french-cantarell21.json
new file mode 100644
index 00000000..e9bb6991
--- /dev/null
+++ b/needles/anaconda_install_user_creation_screen_french-cantarell21.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    "anaconda_install_user_creation_screen",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 201,
+      "type": "match",
+      "height": 17,
+      "width": 107,
+      "ypos": 153
+    },
+    {
+      "ypos": 280,
+      "type": "match",
+      "xpos": 224,
+      "height": 17,
+      "width": 84
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_screen_french-cantarell21.png b/needles/anaconda_install_user_creation_screen_french-cantarell21.png
new file mode 100644
index 00000000..ef1e55a8
Binary files /dev/null and b/needles/anaconda_install_user_creation_screen_french-cantarell21.png differ
diff --git a/needles/anaconda_kde_highlighted-cantarell21.json b/needles/anaconda_kde_highlighted-cantarell21.json
new file mode 100644
index 00000000..a81a85b0
--- /dev/null
+++ b/needles/anaconda_kde_highlighted-cantarell21.json
@@ -0,0 +1,15 @@
+{
+  "tags": [
+    "anaconda_kde_highlighted"
+  ],
+  "area": [
+    {
+      "ypos": 294,
+      "type": "match",
+      "width": 26,
+      "height": 12,
+      "xpos": 48
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_kde_highlighted-cantarell21.png b/needles/anaconda_kde_highlighted-cantarell21.png
new file mode 100644
index 00000000..4f1e9e2a
Binary files /dev/null and b/needles/anaconda_kde_highlighted-cantarell21.png differ
diff --git a/needles/anaconda_kde_selected-cantarell21.json b/needles/anaconda_kde_selected-cantarell21.json
new file mode 100644
index 00000000..1524262c
--- /dev/null
+++ b/needles/anaconda_kde_selected-cantarell21.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 293,
+      "height": 12,
+      "type": "match",
+      "xpos": 28,
+      "width": 49
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_kde_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_kde_selected-cantarell21.png b/needles/anaconda_kde_selected-cantarell21.png
new file mode 100644
index 00000000..cefcd83e
Binary files /dev/null and b/needles/anaconda_kde_selected-cantarell21.png differ
diff --git a/needles/anaconda_main_hub_installation_source.json b/needles/anaconda_main_hub_installation_source.json
index ba9309cc..58c8d905 100644
--- a/needles/anaconda_main_hub_installation_source.json
+++ b/needles/anaconda_main_hub_installation_source.json
@@ -7,18 +7,12 @@
   ],
   "area": [
     {
-      "xpos": 185,
-      "ypos": 347,
       "width": 72,
+      "type": "match",
       "height": 61,
-      "type": "match"
-    },
-    {
-      "xpos": 267,
-      "ypos": 348,
-      "width": 199,
-      "height": 29,
-      "type": "match"
+      "xpos": 185,
+      "ypos": 342
     }
-  ]
+  ],
+  "properties": []
 }
\ No newline at end of file
diff --git a/needles/anaconda_main_hub_installation_source.png b/needles/anaconda_main_hub_installation_source.png
index 9a9f2b84..b7a1e00f 100644
Binary files a/needles/anaconda_main_hub_installation_source.png and b/needles/anaconda_main_hub_installation_source.png differ
diff --git a/needles/anaconda_minimal_highlighted-cantarell21.json b/needles/anaconda_minimal_highlighted-cantarell21.json
new file mode 100644
index 00000000..ef47b8da
--- /dev/null
+++ b/needles/anaconda_minimal_highlighted-cantarell21.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "ypos": 140,
+      "height": 15,
+      "type": "match",
+      "width": 91,
+      "xpos": 50
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_minimal_highlighted",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_highlighted-cantarell21.png b/needles/anaconda_minimal_highlighted-cantarell21.png
new file mode 100644
index 00000000..725fd5b4
Binary files /dev/null and b/needles/anaconda_minimal_highlighted-cantarell21.png differ
diff --git a/needles/anaconda_minimal_highlighted_french-cantarell21.json b/needles/anaconda_minimal_highlighted_french-cantarell21.json
new file mode 100644
index 00000000..4e3f7c0d
--- /dev/null
+++ b/needles/anaconda_minimal_highlighted_french-cantarell21.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "width": 133,
+      "type": "match",
+      "height": 15,
+      "xpos": 47,
+      "ypos": 140
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_minimal_highlighted",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_highlighted_french-cantarell21.png b/needles/anaconda_minimal_highlighted_french-cantarell21.png
new file mode 100644
index 00000000..00df9a11
Binary files /dev/null and b/needles/anaconda_minimal_highlighted_french-cantarell21.png differ
diff --git a/needles/anaconda_minimal_selected-cantarell21.json b/needles/anaconda_minimal_selected-cantarell21.json
new file mode 100644
index 00000000..cc56516e
--- /dev/null
+++ b/needles/anaconda_minimal_selected-cantarell21.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "anaconda_minimal_selected",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "height": 14,
+      "type": "match",
+      "width": 114,
+      "xpos": 28,
+      "ypos": 140
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected-cantarell21.png b/needles/anaconda_minimal_selected-cantarell21.png
new file mode 100644
index 00000000..725fd5b4
Binary files /dev/null and b/needles/anaconda_minimal_selected-cantarell21.png differ
diff --git a/needles/anaconda_minimal_selected_french-cantarell21.json b/needles/anaconda_minimal_selected_french-cantarell21.json
new file mode 100644
index 00000000..db3d60ae
--- /dev/null
+++ b/needles/anaconda_minimal_selected_french-cantarell21.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "anaconda_minimal_selected",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "ypos": 140,
+      "height": 14,
+      "type": "match",
+      "xpos": 28,
+      "width": 154
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected_french-cantarell21.png b/needles/anaconda_minimal_selected_french-cantarell21.png
new file mode 100644
index 00000000..00df9a11
Binary files /dev/null and b/needles/anaconda_minimal_selected_french-cantarell21.png differ
diff --git a/needles/anaconda_part_device_type-gtk3197bug.json b/needles/anaconda_part_device_type-gtk3197bug.json
new file mode 100644
index 00000000..da169ffc
--- /dev/null
+++ b/needles/anaconda_part_device_type-gtk3197bug.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 49,
+      "xpos": 375,
+      "width": 144,
+      "ypos": 288
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_part_device_type",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_device_type-gtk3197bug.png b/needles/anaconda_part_device_type-gtk3197bug.png
new file mode 100644
index 00000000..2a31c894
Binary files /dev/null and b/needles/anaconda_part_device_type-gtk3197bug.png differ
diff --git a/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.json b/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.json
new file mode 100644
index 00000000..242ab6bf
--- /dev/null
+++ b/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "anaconda_part_fs",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "ypos": 348,
+      "height": 56,
+      "type": "match",
+      "xpos": 376,
+      "width": 73
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.png b/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.png
new file mode 100644
index 00000000..b462144c
Binary files /dev/null and b/needles/anaconda_part_fs_ext4_preselected-gtk3197bug.png differ
diff --git a/needles/anaconda_part_select_swap-cantarell21.json b/needles/anaconda_part_select_swap-cantarell21.json
new file mode 100644
index 00000000..73f0c289
--- /dev/null
+++ b/needles/anaconda_part_select_swap-cantarell21.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "anaconda_part_select_swap",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-generic_boot"
+  ],
+  "area": [
+    {
+      "height": 19,
+      "type": "match",
+      "xpos": 50,
+      "width": 48,
+      "ypos": 233
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_select_swap-cantarell21.png b/needles/anaconda_part_select_swap-cantarell21.png
new file mode 100644
index 00000000..9e88471c
Binary files /dev/null and b/needles/anaconda_part_select_swap-cantarell21.png differ
diff --git a/needles/anaconda_select_install_lang-cantarell21.json b/needles/anaconda_select_install_lang-cantarell21.json
new file mode 100644
index 00000000..9ded37c1
--- /dev/null
+++ b/needles/anaconda_select_install_lang-cantarell21.json
@@ -0,0 +1,17 @@
+{
+  "properties": [],
+  "area": [
+    {
+      "height": 28,
+      "type": "match",
+      "xpos": 353,
+      "width": 93,
+      "ypos": 97
+    }
+  ],
+  "tags": [
+    "anaconda_select_install_lang",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_select_install_lang-cantarell21.png b/needles/anaconda_select_install_lang-cantarell21.png
new file mode 100644
index 00000000..70721e78
Binary files /dev/null and b/needles/anaconda_select_install_lang-cantarell21.png differ
diff --git a/needles/anaconda_user_creation_password_input-cantarell21.json b/needles/anaconda_user_creation_password_input-cantarell21.json
new file mode 100644
index 00000000..ffc5929b
--- /dev/null
+++ b/needles/anaconda_user_creation_password_input-cantarell21.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 25,
+      "type": "match",
+      "width": 243,
+      "xpos": 260,
+      "ypos": 276
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_user_creation_password_input",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_user_creation_password_input-cantarell21.png b/needles/anaconda_user_creation_password_input-cantarell21.png
new file mode 100644
index 00000000..c7c689ec
Binary files /dev/null and b/needles/anaconda_user_creation_password_input-cantarell21.png differ
diff --git a/needles/gnome_desktop_clean-cantarell21.json b/needles/gnome_desktop_clean-cantarell21.json
new file mode 100644
index 00000000..34cfc8e3
--- /dev/null
+++ b/needles/gnome_desktop_clean-cantarell21.json
@@ -0,0 +1,25 @@
+{
+  "area": [
+    {
+      "ypos": 6,
+      "type": "match",
+      "xpos": 9,
+      "height": 15,
+      "width": 67
+    },
+    {
+      "ypos": 4,
+      "type": "match",
+      "width": 43,
+      "height": 18,
+      "xpos": 968
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-gnome",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "graphical_desktop_clean"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome_desktop_clean-cantarell21.png b/needles/gnome_desktop_clean-cantarell21.png
new file mode 100644
index 00000000..66bf2f39
Binary files /dev/null and b/needles/gnome_desktop_clean-cantarell21.png differ