diff --git a/flake.nix b/flake.nix
index 7c91049..0ca3c2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,8 +5,7 @@
     disko.inputs.nixpkgs.follows = "nixpkgs";
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     radiantwave.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=main";
-    radiantwave-dev.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave.git?ref=dev";
-    # radiantwave-dev.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave-cpp.git?ref=dev";
+    radiantwave-legacy.url = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/radiantwave-legacy.git?ref=main";
     nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
   };
 
@@ -17,7 +16,7 @@
       disko,
       nixos-facter-modules,
       radiantwave,
-      radiantwave-dev,
+      radiantwave-legacy,
       nixos-raspberrypi,
       ...
     }@inputs:
@@ -118,52 +117,52 @@
       nixosConfigurations = {
         radiantwavekiosk = mkKioskSystem {
           system = "x86_64-linux";
-          radiantwave = radiantwave;
+          radiantwave = radiantwave-legacy;
           diskModule = ./disk-config.nix;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk";
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk";
           extraModules = [];
         };
         # Kiosk-dev
         radiantwavekiosk-dev = mkKioskSystem {
           system = "x86_64-linux";
-          radiantwave = radiantwave-dev;
+          radiantwave = radiantwave;
           diskModule = ./disk-config.nix;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-dev";
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-dev";
           extraModules = [];
         };
         # Commercial
         radiantwavekiosk-commercial = mkKioskSystem {
           system = "x86_64-linux";
-          radiantwave = radiantwave;
+          radiantwave = radiantwave-legacy;
           diskModule = ./commercial-disk-config.nix;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-commercial";
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-commercial";
           extraModules = [];
         };
         # Commercial-dev
         radiantwavekiosk-commercial-dev = mkKioskSystem {
           system = "x86_64-linux";
-          radiantwave = radiantwave-dev;
+          radiantwave = radiantwave;
           diskModule = ./commercial-disk-config.nix;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-commercial";
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-commercial";
           extraModules = [];
         };
         # Kiosk - rotated screen for android displays
         radiantwavekiosk-android = mkKioskSystem {
           system = "x86_64-linux";
-          radiantwave = radiantwave;
+          radiantwave = radiantwave-legacy;
           diskModule = ./disk-config.nix;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-android";
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-android";
           extraModules = [./rotated_display.nix  ];
         };
         # Raspberry pi 5
         radiantwavekiosk-rpi = mkRpiKioskSystem {
-          radiantwave = radiantwave;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git#radiantwavekiosk-rpi";
+          radiantwave = radiantwave-legacy;
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git#radiantwavekiosk-rpi";
         };
         # Raspberry pi 5 dev
         radiantwavekiosk-rpi-dev = mkRpiKioskSystem {
-          radiantwave = radiantwave-dev;
-          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git?ref=dev#radiantwavekiosk-rpi-dev";
+          radiantwave = radiantwave;
+          upgradeFlakeRef = "git+https://gitea.radiantwavetech.com/RadiantWaveTech/kioskconfig.git?ref=dev#radiantwavekiosk-rpi-dev";
         };
         # === USB Images ===
         # Kiosk ISO