diff --git a/Sub-GHz/Doorbells/Dongguan_Smart Hero_Electronics/Doorbell999.sub b/Sub-GHz/Doorbells/Dongguan_Smart_Hero_Electronics/Doorbell999.sub
similarity index 100%
rename from Sub-GHz/Doorbells/Dongguan_Smart Hero_Electronics/Doorbell999.sub
rename to Sub-GHz/Doorbells/Dongguan_Smart_Hero_Electronics/Doorbell999.sub
diff --git a/Sub-GHz/Doorbells/Hard Head/Hard Head doorbell.sub b/Sub-GHz/Doorbells/Hard_Head/Hard_Head_doorbell.sub
similarity index 100%
rename from Sub-GHz/Doorbells/Hard Head/Hard Head doorbell.sub
rename to Sub-GHz/Doorbells/Hard_Head/Hard_Head_doorbell.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/15_min.sub b/Sub-GHz/LED/RF_LED_Controller_T917/15_min.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/15_min.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/15_min.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/30_min.sub b/Sub-GHz/LED/RF_LED_Controller_T917/30_min.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/30_min.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/30_min.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/3_min.sub b/Sub-GHz/LED/RF_LED_Controller_T917/3_min.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/3_min.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/3_min.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/5_min.sub b/Sub-GHz/LED/RF_LED_Controller_T917/5_min.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/5_min.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/5_min.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/60_min.sub b/Sub-GHz/LED/RF_LED_Controller_T917/60_min.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/60_min.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/60_min.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Blink.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Blink.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Blink.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Blink.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Brightness_100.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Brightness_100.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Brightness_100.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Brightness_100.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Brightness_25.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Brightness_25.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Brightness_25.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Brightness_25.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Brightness_50.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Brightness_50.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Brightness_50.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Brightness_50.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Brightness_75.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Brightness_75.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Brightness_75.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Brightness_75.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Clear_timer.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Clear_timer.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Clear_timer.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Clear_timer.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Decrease_brightness.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Decrease_brightness.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Decrease_brightness.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Decrease_brightness.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Fade_pulse.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Fade_pulse.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Fade_pulse.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Fade_pulse.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Increase_brightness.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Increase_brightness.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Increase_brightness.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Increase_brightness.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Night_mode.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Night_mode.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Night_mode.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Night_mode.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/Off.sub b/Sub-GHz/LED/RF_LED_Controller_T917/Off.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/Off.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/Off.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/On.sub b/Sub-GHz/LED/RF_LED_Controller_T917/On.sub
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/On.sub
rename to Sub-GHz/LED/RF_LED_Controller_T917/On.sub
diff --git a/Sub-GHz/LED/RF LED Controller T917/README.md b/Sub-GHz/LED/RF_LED_Controller_T917/README.md
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/README.md
rename to Sub-GHz/LED/RF_LED_Controller_T917/README.md
diff --git a/Sub-GHz/LED/RF LED Controller T917/remote.jpg b/Sub-GHz/LED/RF_LED_Controller_T917/remote.jpg
similarity index 100%
rename from Sub-GHz/LED/RF LED Controller T917/remote.jpg
rename to Sub-GHz/LED/RF_LED_Controller_T917/remote.jpg
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/100%.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/100%.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/100%.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/100%.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/25%.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/25%.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/25%.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/25%.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/50%.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/50%.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/50%.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/50%.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/75%.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/75%.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/75%.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/75%.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Auto.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Auto.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Auto.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Auto.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Blue.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Blue.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Blue.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Blue.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Cyan.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Cyan.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Cyan.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Cyan.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Cyan2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Cyan2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Cyan2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Cyan2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Down.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Down.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Down.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Down.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Down_2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Down_2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Down_2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Down_2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Fade_3.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Fade_3.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Fade_3.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Fade_3.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Fade_7.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Fade_7.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Fade_7.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Fade_7.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Flash.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Flash.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Flash.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Flash.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Green.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Green.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Green.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Green.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Hot_pink.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Hot_pink.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Hot_pink.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Hot_pink.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Jump_3.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Jump_3.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Jump_3.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Jump_3.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Jump_7.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Jump_7.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Jump_7.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Jump_7.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Light cyan.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Light cyan.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Light cyan.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Light cyan.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Off.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Off.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Off.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Off.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Off_2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Off_2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Off_2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Off_2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/On.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/On.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/On.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/On.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/On_2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/On_2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/On_2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/On_2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Pink.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Pink.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Pink.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Pink.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Pink2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Pink2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Pink2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Pink2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Purple.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Purple.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Purple.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Purple.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Puruple2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Puruple2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Puruple2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Puruple2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Quick.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Quick.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Quick.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Quick.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Red.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Red.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Red.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Red.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Slow.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Slow.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Slow.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Slow.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Up.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Up.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Up.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Up.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Up_2.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Up_2.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Up_2.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Up_2.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/White.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/White.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/White.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/White.sub
diff --git a/Sub-GHz/LED/SUPERNIGHT RGBW LED/Yellow.sub b/Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Yellow.sub
similarity index 100%
rename from Sub-GHz/LED/SUPERNIGHT RGBW LED/Yellow.sub
rename to Sub-GHz/LED/SUPERNIGHT_RGBW_LED/Yellow.sub