diff --git a/needles/anaconda_install_destination_encrypt_data_french-cantarell18.json b/needles/anaconda_install_destination_encrypt_data_french-cantarell18.json
new file mode 100644
index 00000000..468633be
--- /dev/null
+++ b/needles/anaconda_install_destination_encrypt_data_french-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "xpos": 19,
+      "width": 152,
+      "ypos": 600,
+      "type": "match",
+      "height": 18
+    }
+  ],
+  "tags": [
+    "anaconda_install_destination_encrypt_data",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_encrypt_data_french-cantarell18.png b/needles/anaconda_install_destination_encrypt_data_french-cantarell18.png
new file mode 100644
index 00000000..a1a370f7
Binary files /dev/null and b/needles/anaconda_install_destination_encrypt_data_french-cantarell18.png differ
diff --git a/needles/anaconda_install_destination_select_disk_1-cantarell18.json b/needles/anaconda_install_destination_select_disk_1-cantarell18.json
new file mode 100644
index 00000000..b9e9019a
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_1-cantarell18.json
@@ -0,0 +1,17 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_install_destination_select_disk_1",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 39,
+      "width": 17,
+      "type": "match",
+      "ypos": 277,
+      "height": 24
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_1-cantarell18.png b/needles/anaconda_install_destination_select_disk_1-cantarell18.png
new file mode 100644
index 00000000..739eac5b
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_1-cantarell18.png differ
diff --git a/needles/anaconda_install_destination_select_disk_2-cantarell18.json b/needles/anaconda_install_destination_select_disk_2-cantarell18.json
new file mode 100644
index 00000000..0a36937b
--- /dev/null
+++ b/needles/anaconda_install_destination_select_disk_2-cantarell18.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "xpos": 203,
+      "width": 18,
+      "type": "match",
+      "ypos": 278,
+      "height": 23
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_install_destination_select_disk_2",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_select_disk_2-cantarell18.png b/needles/anaconda_install_destination_select_disk_2-cantarell18.png
new file mode 100644
index 00000000..84d15ffa
Binary files /dev/null and b/needles/anaconda_install_destination_select_disk_2-cantarell18.png differ
diff --git a/needles/anaconda_install_user_creation_screen_french-cantarell18.json b/needles/anaconda_install_user_creation_screen_french-cantarell18.json
new file mode 100644
index 00000000..76556f8d
--- /dev/null
+++ b/needles/anaconda_install_user_creation_screen_french-cantarell18.json
@@ -0,0 +1,25 @@
+{
+  "area": [
+    {
+      "xpos": 206,
+      "width": 111,
+      "ypos": 147,
+      "type": "match",
+      "height": 17
+    },
+    {
+      "height": 17,
+      "ypos": 276,
+      "type": "match",
+      "width": 84,
+      "xpos": 232
+    }
+  ],
+  "tags": [
+    "anaconda_install_user_creation_screen",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_screen_french-cantarell18.png b/needles/anaconda_install_user_creation_screen_french-cantarell18.png
new file mode 100644
index 00000000..886d80b1
Binary files /dev/null and b/needles/anaconda_install_user_creation_screen_french-cantarell18.png differ
diff --git a/needles/anaconda_minimal_highlighted-cantarell18.json b/needles/anaconda_minimal_highlighted-cantarell18.json
new file mode 100644
index 00000000..91bd596f
--- /dev/null
+++ b/needles/anaconda_minimal_highlighted-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "xpos": 54,
+      "width": 91,
+      "height": 15,
+      "type": "match",
+      "ypos": 140
+    }
+  ],
+  "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-cantarell18.png b/needles/anaconda_minimal_highlighted-cantarell18.png
new file mode 100644
index 00000000..8f9629e0
Binary files /dev/null and b/needles/anaconda_minimal_highlighted-cantarell18.png differ
diff --git a/needles/anaconda_minimal_highlighted_french-cantarell18.json b/needles/anaconda_minimal_highlighted_french-cantarell18.json
new file mode 100644
index 00000000..3fac48a0
--- /dev/null
+++ b/needles/anaconda_minimal_highlighted_french-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_minimal_highlighted",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "height": 15,
+      "ypos": 140,
+      "type": "match",
+      "width": 133,
+      "xpos": 50
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_highlighted_french-cantarell18.png b/needles/anaconda_minimal_highlighted_french-cantarell18.png
new file mode 100644
index 00000000..c4770a31
Binary files /dev/null and b/needles/anaconda_minimal_highlighted_french-cantarell18.png differ
diff --git a/needles/anaconda_minimal_selected-cantarell18.json b/needles/anaconda_minimal_selected-cantarell18.json
new file mode 100644
index 00000000..52b46311
--- /dev/null
+++ b/needles/anaconda_minimal_selected-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "anaconda_minimal_selected",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 30,
+      "width": 117,
+      "height": 16,
+      "ypos": 141,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected-cantarell18.png b/needles/anaconda_minimal_selected-cantarell18.png
new file mode 100644
index 00000000..8f9629e0
Binary files /dev/null and b/needles/anaconda_minimal_selected-cantarell18.png differ
diff --git a/needles/anaconda_minimal_selected_french-cantarell18.json b/needles/anaconda_minimal_selected_french-cantarell18.json
new file mode 100644
index 00000000..bbb098fa
--- /dev/null
+++ b/needles/anaconda_minimal_selected_french-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_minimal_selected",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french",
+    "ENV-FLAVOR-server"
+  ],
+  "area": [
+    {
+      "xpos": 30,
+      "width": 152,
+      "height": 14,
+      "ypos": 142,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected_french-cantarell18.png b/needles/anaconda_minimal_selected_french-cantarell18.png
new file mode 100644
index 00000000..c4770a31
Binary files /dev/null and b/needles/anaconda_minimal_selected_french-cantarell18.png differ
diff --git a/needles/anaconda_part_device_type-cantarell18.json b/needles/anaconda_part_device_type-cantarell18.json
new file mode 100644
index 00000000..cbe7191e
--- /dev/null
+++ b/needles/anaconda_part_device_type-cantarell18.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "height": 49,
+      "ypos": 280,
+      "type": "match",
+      "xpos": 376,
+      "width": 144
+    }
+  ],
+  "tags": [
+    "anaconda_part_device_type",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_device_type-cantarell18.png b/needles/anaconda_part_device_type-cantarell18.png
new file mode 100644
index 00000000..d04a3dd4
Binary files /dev/null and b/needles/anaconda_part_device_type-cantarell18.png differ
diff --git a/needles/anaconda_part_fs_ext3-cantarell18.json b/needles/anaconda_part_fs_ext3-cantarell18.json
new file mode 100644
index 00000000..f7cf69d7
--- /dev/null
+++ b/needles/anaconda_part_fs_ext3-cantarell18.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "anaconda_part_fs_ext3",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "height": 16,
+      "ypos": 331,
+      "type": "match",
+      "xpos": 376,
+      "width": 34
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_fs_ext3-cantarell18.png b/needles/anaconda_part_fs_ext3-cantarell18.png
new file mode 100644
index 00000000..bfb723f1
Binary files /dev/null and b/needles/anaconda_part_fs_ext3-cantarell18.png differ
diff --git a/needles/anaconda_part_fs_ext4_preselected-cantarell18.json b/needles/anaconda_part_fs_ext4_preselected-cantarell18.json
new file mode 100644
index 00000000..8fc583d2
--- /dev/null
+++ b/needles/anaconda_part_fs_ext4_preselected-cantarell18.json
@@ -0,0 +1,17 @@
+{
+  "tags": [
+    "anaconda_part_fs",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "height": 56,
+      "ypos": 336,
+      "type": "match",
+      "xpos": 372,
+      "width": 79
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_fs_ext4_preselected-cantarell18.png b/needles/anaconda_part_fs_ext4_preselected-cantarell18.png
new file mode 100644
index 00000000..9403f66f
Binary files /dev/null and b/needles/anaconda_part_fs_ext4_preselected-cantarell18.png differ
diff --git a/needles/anaconda_part_scheme_btrfs-cantarell18.json b/needles/anaconda_part_scheme_btrfs-cantarell18.json
new file mode 100644
index 00000000..6de28795
--- /dev/null
+++ b/needles/anaconda_part_scheme_btrfs-cantarell18.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "ypos": 250,
+      "height": 20,
+      "width": 40,
+      "xpos": 60
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "anaconda_part_scheme_btrfs",
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_part_scheme_btrfs-cantarell18.png b/needles/anaconda_part_scheme_btrfs-cantarell18.png
new file mode 100644
index 00000000..7d60e67a
Binary files /dev/null and b/needles/anaconda_part_scheme_btrfs-cantarell18.png differ
diff --git a/needles/anaconda_select_install_lang_french_filtered-cantarell18.json b/needles/anaconda_select_install_lang_french_filtered-cantarell18.json
new file mode 100644
index 00000000..c5dbace2
--- /dev/null
+++ b/needles/anaconda_select_install_lang_french_filtered-cantarell18.json
@@ -0,0 +1,25 @@
+{
+  "properties": [],
+  "tags": [
+    "anaconda_select_install_lang_filtered",
+    "ENV-DESKTOP-default",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-french"
+  ],
+  "area": [
+    {
+      "width": 103,
+      "xpos": 204,
+      "height": 45,
+      "ypos": 187,
+      "type": "match"
+    },
+    {
+      "xpos": 480,
+      "width": 79,
+      "type": "match",
+      "ypos": 186,
+      "height": 54
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda_select_install_lang_french_filtered-cantarell18.png b/needles/anaconda_select_install_lang_french_filtered-cantarell18.png
new file mode 100644
index 00000000..c90a5785
Binary files /dev/null and b/needles/anaconda_select_install_lang_french_filtered-cantarell18.png differ
diff --git a/needles/gnome_desktop_clean-cantarell18.json b/needles/gnome_desktop_clean-cantarell18.json
new file mode 100644
index 00000000..5b018902
--- /dev/null
+++ b/needles/gnome_desktop_clean-cantarell18.json
@@ -0,0 +1,25 @@
+{
+  "area": [
+    {
+      "xpos": 10,
+      "width": 67,
+      "type": "match",
+      "ypos": 6,
+      "height": 15
+    },
+    {
+      "ypos": 4,
+      "type": "match",
+      "height": 18,
+      "xpos": 968,
+      "width": 43
+    }
+  ],
+  "tags": [
+    "ENV-DESKTOP-gnome",
+    "ENV-DISTRI-fedora",
+    "LANGUAGE-english",
+    "graphical_desktop_clean"
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/gnome_desktop_clean-cantarell18.png b/needles/gnome_desktop_clean-cantarell18.png
new file mode 100644
index 00000000..ac4d7bd7
Binary files /dev/null and b/needles/gnome_desktop_clean-cantarell18.png differ