diff --git a/check-needles.py b/check-needles.py
index b870f0fe..87920257 100755
--- a/check-needles.py
+++ b/check-needles.py
@@ -57,11 +57,11 @@ for testpath in testpaths:
 # now let's do some whitelisting, for awkward cases where we know that
 # we concatenate string literals and stuff
 # versioned backgrounds and release IDs
-for rel in range(30, 100):
+for rel in ["8", "9", "10"]:
     testliterals.append(f"{rel}_background")
     testliterals.append(f"version_{rel}_ident")
 # anaconda id needles, using tell_source
-for source in ("workstation", "generic", "server"):
+for source in ("generic", "server"):
     testliterals.append(f"leftbar_{source}")
     testliterals.append(f"topbar_{source}")
 # keyboard layout switching, using desktop_switch_layout
@@ -69,7 +69,7 @@ for environment in ("anaconda", "gnome"):
     for layout in ("native", "ascii"):
         testliterals.append(f"{environment}_layout_{layout}")
 # package set selection, using get_var('PACKAGE_SET')
-for pkgset in ("kde", "workstation", "minimal"):
+for pkgset in ("minimal", "server", "graphical-server", "workstation", "virtualization-host"):
     testliterals.append(f"anaconda_{pkgset}_highlighted")
     testliterals.append(f"anaconda_{pkgset}_selected")
 # desktop_login stuff
@@ -93,6 +93,16 @@ for dtype in ("lvmvg", "lvmlv", "lvmthin", "raid"):
 for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"):
     testliterals.append(f"anaconda_blivet_part_fs_{fsys}")
     testliterals.append(f"anaconda_blivet_part_fs_{fsys}_selected")
+# custom_gui
+for dtype in ("", "_lvmlv", "_raid", "_standard_partition"):
+    testliterals.append(f"anaconda_custom_part_devicetype{dtype}")
+for ptype in ("raid_1", "raid_4"):
+    testliterals.append(f"anaconda_custom_part_{ptype}")
+    testliterals.append(f"anaconda_custom_part_{ptype}_selected")
+for fsys in ("efi_filesystem", "ext4", "swap", "xfs"):
+    testliterals.append(f"anaconda_custom_part_fs_{fsys}")
+    testliterals.append(f"anaconda_custom_part_fs_{fsys}_selected")
+
 # this is variable-y in custom_change_type but we only actually have
 # one value
 testliterals.append("anaconda_part_device_type_raid")
diff --git a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json b/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json
deleted file mode 100644
index ddacd206..00000000
--- a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 9,
-      "type": "match",
-      "width": 139,
-      "height": 701,
-      "ypos": 45
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "leftbar_workstation"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png b/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png
deleted file mode 100644
index 408d02a7..00000000
Binary files a/needles/anaconda/identification/leftbar_workstation-newlogo-20210324.png and /dev/null differ
diff --git a/needles/anaconda/identification/leftbar_workstation.json b/needles/anaconda/identification/leftbar_workstation.json
deleted file mode 100644
index 80234c6f..00000000
--- a/needles/anaconda/identification/leftbar_workstation.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "leftbar_workstation"
-  ],
-  "area": [
-    {
-      "xpos": 9,
-      "ypos": 44,
-      "width": 139,
-      "height": 701,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/leftbar_workstation.png b/needles/anaconda/identification/leftbar_workstation.png
deleted file mode 100644
index 870b159b..00000000
Binary files a/needles/anaconda/identification/leftbar_workstation.png and /dev/null differ
diff --git a/needles/anaconda/identification/topbar_workstation.json b/needles/anaconda/identification/topbar_workstation.json
deleted file mode 100644
index 2f68d19f..00000000
--- a/needles/anaconda/identification/topbar_workstation.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "topbar_workstation"
-  ],
-  "area": [
-    {
-      "xpos": 95,
-      "ypos": 69,
-      "width": 675,
-      "height": 38,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/topbar_workstation.png b/needles/anaconda/identification/topbar_workstation.png
deleted file mode 100644
index 4df74b40..00000000
Binary files a/needles/anaconda/identification/topbar_workstation.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_30.json b/needles/anaconda/identification/version_30.json
deleted file mode 100644
index cc4aceba..00000000
--- a/needles/anaconda/identification/version_30.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 796,
-      "ypos": 40,
-      "width": 93,
-      "height": 32,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_30_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_30.png b/needles/anaconda/identification/version_30.png
deleted file mode 100644
index d0ff4772..00000000
Binary files a/needles/anaconda/identification/version_30.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_31-iot-20200213.json b/needles/anaconda/identification/version_31-iot-20200213.json
deleted file mode 100644
index c83f60dc..00000000
--- a/needles/anaconda/identification/version_31-iot-20200213.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 13,
-      "height": 20,
-      "width": 124,
-      "type": "match",
-      "xpos": 764
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_31_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_31-iot-20200213.png b/needles/anaconda/identification/version_31-iot-20200213.png
deleted file mode 100644
index efcf33aa..00000000
Binary files a/needles/anaconda/identification/version_31-iot-20200213.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_31.json b/needles/anaconda/identification/version_31.json
deleted file mode 100644
index 96600023..00000000
--- a/needles/anaconda/identification/version_31.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 783,
-      "ypos": 40,
-      "width": 90,
-      "height": 20,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_31_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_31.png b/needles/anaconda/identification/version_31.png
deleted file mode 100644
index 8cd5c919..00000000
Binary files a/needles/anaconda/identification/version_31.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_32-iot-20200220.json b/needles/anaconda/identification/version_32-iot-20200220.json
deleted file mode 100644
index ec5f8bdf..00000000
--- a/needles/anaconda/identification/version_32-iot-20200220.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 782,
-      "ypos": 15,
-      "width": 114,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_32_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_32-iot-20200220.png b/needles/anaconda/identification/version_32-iot-20200220.png
deleted file mode 100644
index 2a8d2fba..00000000
Binary files a/needles/anaconda/identification/version_32-iot-20200220.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_32.json b/needles/anaconda/identification/version_32.json
deleted file mode 100644
index 345728d0..00000000
--- a/needles/anaconda/identification/version_32.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 787,
-      "ypos": 15,
-      "width": 83,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_32_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_32.png b/needles/anaconda/identification/version_32.png
deleted file mode 100644
index 13c34166..00000000
Binary files a/needles/anaconda/identification/version_32.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_33-20200817.json b/needles/anaconda/identification/version_33-20200817.json
deleted file mode 100644
index 91d371d2..00000000
--- a/needles/anaconda/identification/version_33-20200817.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 784,
-      "height": 19,
-      "ypos": 13,
-      "width": 85,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_33_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_33-20200817.png b/needles/anaconda/identification/version_33-20200817.png
deleted file mode 100644
index a0870ae0..00000000
Binary files a/needles/anaconda/identification/version_33-20200817.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_33_iot.json b/needles/anaconda/identification/version_33_iot.json
deleted file mode 100644
index 15a92f8d..00000000
--- a/needles/anaconda/identification/version_33_iot.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 778,
-      "ypos": 13,
-      "width": 118,
-      "height": 19,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_33_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_33_iot.png b/needles/anaconda/identification/version_33_iot.png
deleted file mode 100644
index 63df8740..00000000
Binary files a/needles/anaconda/identification/version_33_iot.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_34-20210210.json b/needles/anaconda/identification/version_34-20210210.json
deleted file mode 100644
index d93ea560..00000000
--- a/needles/anaconda/identification/version_34-20210210.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 14,
-      "height": 17,
-      "xpos": 785,
-      "type": "match",
-      "width": 87
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_34_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_34-20210210.png b/needles/anaconda/identification/version_34-20210210.png
deleted file mode 100644
index f3a3dd27..00000000
Binary files a/needles/anaconda/identification/version_34-20210210.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_34_iot-20200824.json b/needles/anaconda/identification/version_34_iot-20200824.json
deleted file mode 100644
index 14d73e6d..00000000
--- a/needles/anaconda/identification/version_34_iot-20200824.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 778,
-      "ypos": 14,
-      "width": 117,
-      "height": 17,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_34_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_34_iot-20200824.png b/needles/anaconda/identification/version_34_iot-20200824.png
deleted file mode 100644
index a66afdcc..00000000
Binary files a/needles/anaconda/identification/version_34_iot-20200824.png and /dev/null differ
diff --git a/needles/anaconda/identification/version_35_iot-20210218.json b/needles/anaconda/identification/version_35_iot-20210218.json
deleted file mode 100644
index 7887ea7b..00000000
--- a/needles/anaconda/identification/version_35_iot-20210218.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 778,
-      "ypos": 14,
-      "width": 118,
-      "height": 18,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "version_35_ident"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/identification/version_35_iot-20210218.png b/needles/anaconda/identification/version_35_iot-20210218.png
deleted file mode 100644
index 89808ce6..00000000
Binary files a/needles/anaconda/identification/version_35_iot-20210218.png and /dev/null differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_create_user-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_destination-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_install_source-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_keyboard_layout-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_language_support-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_network_host_name-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_root_password-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_software_selection-20220203.png
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.json
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.json
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.png
similarity index 100%
rename from needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_time_date-20220203.png
diff --git a/needles/anaconda/package_selection/kde_highlighted-20210716.json b/needles/anaconda/package_selection/kde_highlighted-20210716.json
deleted file mode 100644
index b8308574..00000000
--- a/needles/anaconda/package_selection/kde_highlighted-20210716.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 12,
-      "ypos": 331,
-      "type": "match",
-      "width": 26,
-      "xpos": 49
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_kde_highlighted"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/package_selection/kde_highlighted-20210716.png b/needles/anaconda/package_selection/kde_highlighted-20210716.png
deleted file mode 100644
index cbd16497..00000000
Binary files a/needles/anaconda/package_selection/kde_highlighted-20210716.png and /dev/null differ
diff --git a/needles/anaconda/package_selection/kde_highlighted-freetype262.json b/needles/anaconda/package_selection/kde_highlighted-freetype262.json
deleted file mode 100644
index 69a4d4e3..00000000
--- a/needles/anaconda/package_selection/kde_highlighted-freetype262.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tags": [
-    "anaconda_kde_highlighted"
-  ],
-  "area": [
-    {
-      "ypos": 294,
-      "type": "match",
-      "height": 12,
-      "xpos": 53,
-      "width": 26
-    }
-  ],
-  "properties": []
-}
\ No newline at end of file
diff --git a/needles/anaconda/package_selection/kde_highlighted-freetype262.png b/needles/anaconda/package_selection/kde_highlighted-freetype262.png
deleted file mode 100644
index e069907d..00000000
Binary files a/needles/anaconda/package_selection/kde_highlighted-freetype262.png and /dev/null differ
diff --git a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json b/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json
deleted file mode 100644
index cc307152..00000000
--- a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 331,
-      "type": "match",
-      "height": 12,
-      "width": 49,
-      "xpos": 29
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_kde_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png b/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png
deleted file mode 100644
index 13552203..00000000
Binary files a/needles/anaconda/package_selection/kde_selected-bluebutton-20200219.png and /dev/null differ
diff --git a/needles/background/33_background-1222-20210715.json b/needles/background/33_background-1222-20210715.json
deleted file mode 100644
index 2882c3e9..00000000
--- a/needles/background/33_background-1222-20210715.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 225,
-      "type": "match",
-      "width": 104,
-      "xpos": 837,
-      "height": 121
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-1222-20210715.png b/needles/background/33_background-1222-20210715.png
deleted file mode 100644
index f594ad56..00000000
Binary files a/needles/background/33_background-1222-20210715.png and /dev/null differ
diff --git a/needles/background/33_background-dawn-20200831.json b/needles/background/33_background-dawn-20200831.json
deleted file mode 100644
index b97daef9..00000000
--- a/needles/background/33_background-dawn-20200831.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "match": 90,
-      "width": 81,
-      "height": 129,
-      "xpos": 833,
-      "ypos": 74
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dawn-20200831.png b/needles/background/33_background-dawn-20200831.png
deleted file mode 100644
index 8170705d..00000000
Binary files a/needles/background/33_background-dawn-20200831.png and /dev/null differ
diff --git a/needles/background/33_background-dawn-20201007.json b/needles/background/33_background-dawn-20201007.json
deleted file mode 100644
index aae0cd74..00000000
--- a/needles/background/33_background-dawn-20201007.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "match": 90,
-      "width": 104,
-      "ypos": 225,
-      "height": 121,
-      "xpos": 691
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dawn-20201007.png b/needles/background/33_background-dawn-20201007.png
deleted file mode 100644
index cfeea660..00000000
Binary files a/needles/background/33_background-dawn-20201007.png and /dev/null differ
diff --git a/needles/background/33_background-dawnday-20201008.json b/needles/background/33_background-dawnday-20201008.json
deleted file mode 100644
index d536fc49..00000000
--- a/needles/background/33_background-dawnday-20201008.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 838,
-      "height": 121,
-      "ypos": 225,
-      "width": 104,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dawnday-20201008.png b/needles/background/33_background-dawnday-20201008.png
deleted file mode 100644
index febf06a1..00000000
Binary files a/needles/background/33_background-dawnday-20201008.png and /dev/null differ
diff --git a/needles/background/33_background-dawnday-20201011.json b/needles/background/33_background-dawnday-20201011.json
deleted file mode 100644
index 8eca675f..00000000
--- a/needles/background/33_background-dawnday-20201011.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 104,
-      "type": "match",
-      "match": 90,
-      "height": 121,
-      "xpos": 691,
-      "ypos": 225
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dawnday-20201011.png b/needles/background/33_background-dawnday-20201011.png
deleted file mode 100644
index 3fd9f13c..00000000
Binary files a/needles/background/33_background-dawnday-20201011.png and /dev/null differ
diff --git a/needles/background/33_background-day-20200821.json b/needles/background/33_background-day-20200821.json
deleted file mode 100644
index bc54fb4c..00000000
--- a/needles/background/33_background-day-20200821.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 833,
-      "height": 129,
-      "ypos": 74,
-      "type": "match",
-      "match": 90,
-      "width": 81
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-day-20200821.png b/needles/background/33_background-day-20200821.png
deleted file mode 100644
index 5e801654..00000000
Binary files a/needles/background/33_background-day-20200821.png and /dev/null differ
diff --git a/needles/background/33_background-day-20201006.json b/needles/background/33_background-day-20201006.json
deleted file mode 100644
index f7869e58..00000000
--- a/needles/background/33_background-day-20201006.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 104,
-      "type": "match",
-      "match": 90,
-      "height": 121,
-      "xpos": 838,
-      "ypos": 225
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-day-20201006.png b/needles/background/33_background-day-20201006.png
deleted file mode 100644
index 21eb139a..00000000
Binary files a/needles/background/33_background-day-20201006.png and /dev/null differ
diff --git a/needles/background/33_background-dusk-20200825.json b/needles/background/33_background-dusk-20200825.json
deleted file mode 100644
index 79d54fd7..00000000
--- a/needles/background/33_background-dusk-20200825.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 81,
-      "type": "match",
-      "match": 90,
-      "ypos": 74,
-      "height": 129,
-      "xpos": 833
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dusk-20200825.png b/needles/background/33_background-dusk-20200825.png
deleted file mode 100644
index ebb6df06..00000000
Binary files a/needles/background/33_background-dusk-20200825.png and /dev/null differ
diff --git a/needles/background/33_background-dusknight-20210122.json b/needles/background/33_background-dusknight-20210122.json
deleted file mode 100644
index 1a8baabf..00000000
--- a/needles/background/33_background-dusknight-20210122.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 225,
-      "type": "match",
-      "match": 90,
-      "xpos": 691,
-      "height": 121,
-      "width": 104
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-dusknight-20210122.png b/needles/background/33_background-dusknight-20210122.png
deleted file mode 100644
index 8c888ab8..00000000
Binary files a/needles/background/33_background-dusknight-20210122.png and /dev/null differ
diff --git a/needles/background/33_background-night-20200821.json b/needles/background/33_background-night-20200821.json
deleted file mode 100644
index e9975750..00000000
--- a/needles/background/33_background-night-20200821.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 836,
-      "ypos": 72,
-      "width": 81,
-      "height": 129,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-night-20200821.png b/needles/background/33_background-night-20200821.png
deleted file mode 100644
index 97601ab1..00000000
Binary files a/needles/background/33_background-night-20200821.png and /dev/null differ
diff --git a/needles/background/33_background-night-20201007.json b/needles/background/33_background-night-20201007.json
deleted file mode 100644
index b81a9567..00000000
--- a/needles/background/33_background-night-20201007.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 104,
-      "type": "match",
-      "match": 90,
-      "ypos": 225,
-      "height": 121,
-      "xpos": 691
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "33_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/33_background-night-20201007.png b/needles/background/33_background-night-20201007.png
deleted file mode 100644
index d76ffb32..00000000
Binary files a/needles/background/33_background-night-20201007.png and /dev/null differ
diff --git a/needles/background/34_background-day-20210212.json b/needles/background/34_background-day-20210212.json
deleted file mode 100644
index 3f7eee03..00000000
--- a/needles/background/34_background-day-20210212.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "match": 90,
-      "width": 142,
-      "xpos": 794,
-      "ypos": 313,
-      "height": 132
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "34_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/34_background-day-20210212.png b/needles/background/34_background-day-20210212.png
deleted file mode 100644
index a1dff46b..00000000
Binary files a/needles/background/34_background-day-20210212.png and /dev/null differ
diff --git a/needles/background/34_background-night-20210210.json b/needles/background/34_background-night-20210210.json
deleted file mode 100644
index 44499393..00000000
--- a/needles/background/34_background-night-20210210.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 794,
-      "ypos": 313,
-      "width": 142,
-      "height": 132,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "34_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/34_background-night-20210210.png b/needles/background/34_background-night-20210210.png
deleted file mode 100644
index e4821ab4..00000000
Binary files a/needles/background/34_background-night-20210210.png and /dev/null differ
diff --git a/needles/background/34_background-transition1-20210302.json b/needles/background/34_background-transition1-20210302.json
deleted file mode 100644
index a2dbf8d1..00000000
--- a/needles/background/34_background-transition1-20210302.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 132,
-      "ypos": 312,
-      "xpos": 794,
-      "width": 142,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "34_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/34_background-transition1-20210302.png b/needles/background/34_background-transition1-20210302.png
deleted file mode 100644
index d0f30455..00000000
Binary files a/needles/background/34_background-transition1-20210302.png and /dev/null differ
diff --git a/needles/background/34_background-transition2-20210302.json b/needles/background/34_background-transition2-20210302.json
deleted file mode 100644
index 0f024e03..00000000
--- a/needles/background/34_background-transition2-20210302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "match": 90,
-      "width": 142,
-      "ypos": 313,
-      "height": 132,
-      "xpos": 794
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "34_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/34_background-transition2-20210302.png b/needles/background/34_background-transition2-20210302.png
deleted file mode 100644
index 99243d9e..00000000
Binary files a/needles/background/34_background-transition2-20210302.png and /dev/null differ
diff --git a/needles/background/34_background-transition3-20210302.json b/needles/background/34_background-transition3-20210302.json
deleted file mode 100644
index 1da4727c..00000000
--- a/needles/background/34_background-transition3-20210302.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 794,
-      "ypos": 314,
-      "height": 132,
-      "type": "match",
-      "match": 90,
-      "width": 142
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "34_background"
-  ]
-}
\ No newline at end of file
diff --git a/needles/background/34_background-transition3-20210302.png b/needles/background/34_background-transition3-20210302.png
deleted file mode 100644
index aedcd757..00000000
Binary files a/needles/background/34_background-transition3-20210302.png and /dev/null differ