diff --git a/homes/julian/features/hyprland/default.nix b/homes/julian/features/hyprland/default.nix
index a3251a1..464b32c 100644
--- a/homes/julian/features/hyprland/default.nix
+++ b/homes/julian/features/hyprland/default.nix
@@ -19,7 +19,7 @@
     ./waypipe.nix
 
     # ./hyprbars.nix
-    # inputs.noctalia.homeModules.default # Use for latest version from inputs
+    inputs.noctalia.homeModules.default # Use for latest version from inputs
   ];
 
   xdg.portal = {
@@ -40,16 +40,15 @@
   };
 
   # noctalia-shell ipc call state all | jq .settings | xclip
-  xdg.configFile."noctalia/settings.json".source = ./noctalia.json;
+  # xdg.configFile."noctalia/settings.json".source = ./noctalia.json;
 
-  # programs.noctalia = {
-  #   enable = true;
-  #   # noctalia config export full > noctalia.toml
-  #   settings = ./noctalia.toml;
-  # };
+  programs.noctalia = {
+    enable = true;
+    # noctalia config export full > noctalia.toml
+    settings = ./noctalia.toml;
+  };
 
   home.packages = with pkgs; [
-    unstable.noctalia-shell # Use for stable version instead of latest from the input
     hyprpicker
     hyprcursor
     brightnessctl
@@ -105,8 +104,7 @@
         local terminal = "${config.terminal}"
         local fileManager = "pcmanfm"
         -- local menu = "wofi --show drun,run"
-        -- local menu = "noctalia msg panel-toggle launcher"
-        local menu = "noctalia-shell ipc call launcher toggle"
+        local menu = "noctalia msg panel-toggle launcher"
         local calculator = "qalculate-gtk"
         local browser = "firefox"
         local editor = "emacs"
diff --git a/homes/julian/features/hyprland/hyprland.lua b/homes/julian/features/hyprland/hyprland.lua
index d10b3e1..40a8730 100644
--- a/homes/julian/features/hyprland/hyprland.lua
+++ b/homes/julian/features/hyprland/hyprland.lua
@@ -5,7 +5,7 @@
 -- See https://wiki.hypr.land/Configuring/Basics/Autostart/
 hl.on("hyprland.start", function()
 	-- hl.exec_cmd("waybar")
-	hl.exec_cmd("env QT_QPA_PLATFORMTHEME=qt5ct noctalia-shell") -- env ensures noctalia works alongside kde
+	hl.exec_cmd("env QT_QPA_PLATFORMTHEME=qt5ct noctalia") -- env ensures noctalia works alongside kde
 	hl.exec_cmd("firefox")
 	hl.exec_cmd("fcitx5 -d -r")
 end)
diff --git a/homes/julian/features/hyprland/noctalia.json b/homes/julian/features/hyprland/noctalia.json
deleted file mode 100644
index 0acf07b..0000000
--- a/homes/julian/features/hyprland/noctalia.json
+++ /dev/null
@@ -1,646 +0,0 @@
-{
-  "settingsVersion": 59,
-  "bar": {
-    "barType": "simple",
-    "position": "bottom",
-    "monitors": [],
-    "density": "default",
-    "showOutline": false,
-    "showCapsule": false,
-    "capsuleOpacity": 1,
-    "capsuleColorKey": "none",
-    "widgetSpacing": 6,
-    "contentPadding": 2,
-    "fontScale": 1,
-    "enableExclusionZoneInset": false,
-    "backgroundOpacity": 1,
-    "useSeparateOpacity": false,
-    "marginVertical": 4,
-    "marginHorizontal": 4,
-    "frameThickness": 8,
-    "frameRadius": 12,
-    "outerCorners": false,
-    "hideOnOverview": false,
-    "displayMode": "always_visible",
-    "autoHideDelay": 500,
-    "autoShowDelay": 150,
-    "showOnWorkspaceSwitch": true,
-    "widgets": {
-      "left": [
-        {
-          "characterCount": 2,
-          "colorizeIcons": false,
-          "emptyColor": "secondary",
-          "enableScrollWheel": true,
-          "focusedColor": "primary",
-          "followFocusedScreen": false,
-          "fontWeight": "bold",
-          "groupedBorderOpacity": 1,
-          "hideUnoccupied": false,
-          "iconScale": 0.8,
-          "id": "Workspace",
-          "labelMode": "index",
-          "occupiedColor": "secondary",
-          "pillSize": 0.8,
-          "showApplications": false,
-          "showApplicationsHover": false,
-          "showBadge": true,
-          "showLabelsOnlyWhenOccupied": false,
-          "unfocusedIconsOpacity": 1
-        }
-      ],
-      "center": [],
-      "right": [
-        {
-          "compactMode": false,
-          "diskPath": "/",
-          "iconColor": "none",
-          "id": "SystemMonitor",
-          "showCpuCores": false,
-          "showCpuFreq": false,
-          "showCpuTemp": false,
-          "showCpuUsage": true,
-          "showDiskAvailable": true,
-          "showDiskUsage": true,
-          "showDiskUsageAsPercent": false,
-          "showGpuTemp": false,
-          "showLoadAverage": false,
-          "showMemoryAsPercent": true,
-          "showMemoryUsage": true,
-          "showNetworkStats": false,
-          "showSwapUsage": false,
-          "textColor": "none",
-          "useMonospaceFont": true,
-          "usePadding": false
-        },
-        {
-          "compactMode": false,
-          "diskPath": "/",
-          "iconColor": "none",
-          "id": "SystemMonitor",
-          "showCpuCores": false,
-          "showCpuFreq": false,
-          "showCpuTemp": false,
-          "showCpuUsage": false,
-          "showDiskAvailable": false,
-          "showDiskUsage": false,
-          "showDiskUsageAsPercent": false,
-          "showGpuTemp": false,
-          "showLoadAverage": false,
-          "showMemoryAsPercent": false,
-          "showMemoryUsage": false,
-          "showNetworkStats": true,
-          "showSwapUsage": false,
-          "textColor": "none",
-          "useMonospaceFont": true,
-          "usePadding": false
-        },
-        {
-          "displayMode": "alwaysShow",
-          "iconColor": "none",
-          "id": "Volume",
-          "middleClickCommand": "pwvucontrol || pavucontrol",
-          "textColor": "none"
-        },
-        {
-          "deviceNativePath": "__default__",
-          "displayMode": "graphic-clean",
-          "hideIfIdle": false,
-          "hideIfNotDetected": true,
-          "id": "Battery",
-          "showNoctaliaPerformance": false,
-          "showPowerProfiles": false
-        },
-        {
-          "clockColor": "none",
-          "customFont": "",
-          "formatHorizontal": "ddd, dd.MM. HH:mm:ss",
-          "formatVertical": "HH mm - dd MM",
-          "id": "Clock",
-          "tooltipFormat": "HH:mm ddd, MMM dd",
-          "useCustomFont": false
-        },
-        {
-          "blacklist": [],
-          "chevronColor": "none",
-          "colorizeIcons": false,
-          "drawerEnabled": false,
-          "hidePassive": false,
-          "id": "Tray",
-          "pinned": []
-        }
-      ]
-    },
-    "mouseWheelAction": "workspace",
-    "reverseScroll": false,
-    "mouseWheelWrap": true,
-    "middleClickAction": "launcherPanel",
-    "middleClickFollowMouse": false,
-    "middleClickCommand": "",
-    "rightClickAction": "controlCenter",
-    "rightClickFollowMouse": true,
-    "rightClickCommand": "",
-    "screenOverrides": []
-  },
-  "general": {
-    "avatarImage": "/home/julian/.face",
-    "dimmerOpacity": 0.2,
-    "showScreenCorners": false,
-    "forceBlackScreenCorners": false,
-    "scaleRatio": 1,
-    "radiusRatio": 1,
-    "iRadiusRatio": 1,
-    "boxRadiusRatio": 1,
-    "screenRadiusRatio": 1,
-    "animationSpeed": 1,
-    "animationDisabled": false,
-    "compactLockScreen": false,
-    "lockScreenAnimations": false,
-    "lockOnSuspend": true,
-    "showSessionButtonsOnLockScreen": true,
-    "showHibernateOnLockScreen": false,
-    "enableLockScreenMediaControls": false,
-    "enableShadows": true,
-    "enableBlurBehind": true,
-    "shadowDirection": "bottom_right",
-    "shadowOffsetX": 2,
-    "shadowOffsetY": 3,
-    "language": "",
-    "allowPanelsOnScreenWithoutBar": true,
-    "showChangelogOnStartup": true,
-    "telemetryEnabled": false,
-    "enableLockScreenCountdown": false,
-    "lockScreenCountdownDuration": 10000,
-    "autoStartAuth": false,
-    "allowPasswordWithFprintd": false,
-    "clockStyle": "custom",
-    "clockFormat": "hh\\nmm",
-    "passwordChars": false,
-    "lockScreenMonitors": [],
-    "lockScreenBlur": 0,
-    "lockScreenTint": 0,
-    "keybinds": {
-      "keyUp": [
-        "Up"
-      ],
-      "keyDown": [
-        "Down"
-      ],
-      "keyLeft": [
-        "Left"
-      ],
-      "keyRight": [
-        "Right"
-      ],
-      "keyEnter": [
-        "Return",
-        "Enter"
-      ],
-      "keyEscape": [
-        "Esc"
-      ],
-      "keyRemove": [
-        "Del"
-      ]
-    },
-    "reverseScroll": false,
-    "smoothScrollEnabled": true
-  },
-  "ui": {
-    "fontDefault": "DejaVu Sans",
-    "fontFixed": "DejaVu Sans Mono",
-    "fontDefaultScale": 1,
-    "fontFixedScale": 1,
-    "tooltipsEnabled": true,
-    "scrollbarAlwaysVisible": true,
-    "boxBorderEnabled": false,
-    "panelBackgroundOpacity": 1,
-    "translucentWidgets": false,
-    "panelsAttachedToBar": true,
-    "settingsPanelMode": "attached",
-    "settingsPanelSideBarCardStyle": false
-  },
-  "location": {
-    "name": "",
-    "weatherEnabled": true,
-    "weatherShowEffects": true,
-    "weatherTaliaMascotAlways": false,
-    "useFahrenheit": false,
-    "use12hourFormat": false,
-    "showWeekNumberInCalendar": false,
-    "showCalendarEvents": true,
-    "showCalendarWeather": true,
-    "analogClockInCalendar": false,
-    "firstDayOfWeek": -1,
-    "hideWeatherTimezone": false,
-    "hideWeatherCityName": false,
-    "autoLocate": false
-  },
-  "calendar": {
-    "cards": [
-      {
-        "enabled": true,
-        "id": "calendar-header-card"
-      },
-      {
-        "enabled": true,
-        "id": "calendar-month-card"
-      },
-      {
-        "enabled": true,
-        "id": "weather-card"
-      }
-    ]
-  },
-  "wallpaper": {
-    "enabled": false,
-    "overviewEnabled": false,
-    "directory": "/home/julian/Pictures/Wallpapers",
-    "monitorDirectories": [],
-    "enableMultiMonitorDirectories": false,
-    "showHiddenFiles": false,
-    "viewMode": "single",
-    "setWallpaperOnAllMonitors": true,
-    "linkLightAndDarkWallpapers": true,
-    "fillMode": "crop",
-    "fillColor": "#000000",
-    "useSolidColor": false,
-    "solidColor": "#1a1a2e",
-    "automationEnabled": false,
-    "wallpaperChangeMode": "random",
-    "randomIntervalSec": 300,
-    "transitionDuration": 1500,
-    "transitionType": [
-      "fade",
-      "disc",
-      "stripes",
-      "wipe",
-      "pixelate",
-      "honeycomb"
-    ],
-    "skipStartupTransition": false,
-    "transitionEdgeSmoothness": 0.05,
-    "panelPosition": "follow_bar",
-    "hideWallpaperFilenames": false,
-    "useOriginalImages": false,
-    "overviewBlur": 0.4,
-    "overviewTint": 0.6,
-    "useWallhaven": false,
-    "wallhavenQuery": "",
-    "wallhavenSorting": "relevance",
-    "wallhavenOrder": "desc",
-    "wallhavenCategories": "111",
-    "wallhavenPurity": "100",
-    "wallhavenRatios": "",
-    "wallhavenApiKey": "",
-    "wallhavenResolutionMode": "atleast",
-    "wallhavenResolutionWidth": "",
-    "wallhavenResolutionHeight": "",
-    "sortOrder": "name",
-    "favorites": []
-  },
-  "appLauncher": {
-    "enableClipboardHistory": false,
-    "autoPasteClipboard": false,
-    "enableClipPreview": true,
-    "clipboardWrapText": true,
-    "enableClipboardSmartIcons": true,
-    "enableClipboardChips": true,
-    "clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store",
-    "clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store",
-    "position": "center",
-    "pinnedApps": [],
-    "sortByMostUsed": true,
-    "terminalCommand": "alacritty -e",
-    "customLaunchPrefixEnabled": false,
-    "customLaunchPrefix": "",
-    "viewMode": "list",
-    "showCategories": true,
-    "iconMode": "tabler",
-    "showIconBackground": false,
-    "enableSettingsSearch": true,
-    "enableWindowsSearch": true,
-    "enableSessionSearch": true,
-    "ignoreMouseInput": false,
-    "screenshotAnnotationTool": "",
-    "overviewLayer": false,
-    "density": "default"
-  },
-  "controlCenter": {
-    "position": "close_to_bar_button",
-    "diskPath": "/",
-    "shortcuts": {
-      "left": [
-        {
-          "id": "Network"
-        },
-        {
-          "id": "Bluetooth"
-        },
-        {
-          "id": "WallpaperSelector"
-        },
-        {
-          "id": "NoctaliaPerformance"
-        }
-      ],
-      "right": [
-        {
-          "id": "Notifications"
-        },
-        {
-          "id": "PowerProfile"
-        },
-        {
-          "id": "KeepAwake"
-        },
-        {
-          "id": "NightLight"
-        }
-      ]
-    },
-    "cards": [
-      {
-        "enabled": true,
-        "id": "profile-card"
-      },
-      {
-        "enabled": true,
-        "id": "shortcuts-card"
-      },
-      {
-        "enabled": true,
-        "id": "audio-card"
-      },
-      {
-        "enabled": false,
-        "id": "brightness-card"
-      },
-      {
-        "enabled": true,
-        "id": "weather-card"
-      },
-      {
-        "enabled": false,
-        "id": "media-sysmon-card"
-      }
-    ]
-  },
-  "systemMonitor": {
-    "cpuWarningThreshold": 80,
-    "cpuCriticalThreshold": 90,
-    "tempWarningThreshold": 80,
-    "tempCriticalThreshold": 90,
-    "gpuWarningThreshold": 80,
-    "gpuCriticalThreshold": 90,
-    "memWarningThreshold": 80,
-    "memCriticalThreshold": 90,
-    "swapWarningThreshold": 80,
-    "swapCriticalThreshold": 90,
-    "diskWarningThreshold": 80,
-    "diskCriticalThreshold": 90,
-    "diskAvailWarningThreshold": 20,
-    "diskAvailCriticalThreshold": 10,
-    "batteryWarningThreshold": 20,
-    "batteryCriticalThreshold": 5,
-    "enableDgpuMonitoring": false,
-    "useCustomColors": false,
-    "warningColor": "",
-    "criticalColor": "",
-    "externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor"
-  },
-  "noctaliaPerformance": {
-    "disableWallpaper": true,
-    "disableDesktopWidgets": true
-  },
-  "dock": {
-    "enabled": false,
-    "position": "bottom",
-    "displayMode": "auto_hide",
-    "dockType": "floating",
-    "backgroundOpacity": 1,
-    "floatingRatio": 1,
-    "size": 1,
-    "onlySameOutput": true,
-    "monitors": [],
-    "pinnedApps": [],
-    "colorizeIcons": false,
-    "showLauncherIcon": false,
-    "launcherPosition": "end",
-    "launcherUseDistroLogo": false,
-    "launcherIcon": "",
-    "launcherIconColor": "none",
-    "pinnedStatic": false,
-    "inactiveIndicators": false,
-    "groupApps": false,
-    "groupContextMenuMode": "extended",
-    "groupClickAction": "cycle",
-    "groupIndicatorStyle": "dots",
-    "deadOpacity": 0.6,
-    "animationSpeed": 1,
-    "sitOnFrame": false,
-    "showDockIndicator": false,
-    "indicatorThickness": 3,
-    "indicatorColor": "primary",
-    "indicatorOpacity": 0.6
-  },
-  "network": {
-    "bluetoothRssiPollingEnabled": false,
-    "bluetoothRssiPollIntervalMs": 60000,
-    "networkPanelView": "wifi",
-    "wifiDetailsViewMode": "grid",
-    "bluetoothDetailsViewMode": "grid",
-    "bluetoothHideUnnamedDevices": false,
-    "disableDiscoverability": false,
-    "bluetoothAutoConnect": true
-  },
-  "sessionMenu": {
-    "enableCountdown": false,
-    "countdownDuration": 10000,
-    "position": "center",
-    "showHeader": true,
-    "showKeybinds": true,
-    "largeButtonsStyle": false,
-    "largeButtonsLayout": "single-row",
-    "powerOptions": [
-      {
-        "action": "lock",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "1"
-      },
-      {
-        "action": "suspend",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "hibernate",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "reboot",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "2"
-      },
-      {
-        "action": "logout",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "3"
-      },
-      {
-        "action": "shutdown",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "4"
-      },
-      {
-        "action": "rebootToUefi",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "userspaceReboot",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      }
-    ]
-  },
-  "notifications": {
-    "enabled": false,
-    "enableMarkdown": false,
-    "density": "default",
-    "monitors": [],
-    "location": "top_right",
-    "overlayLayer": true,
-    "backgroundOpacity": 1,
-    "respectExpireTimeout": false,
-    "lowUrgencyDuration": 3,
-    "normalUrgencyDuration": 8,
-    "criticalUrgencyDuration": 15,
-    "clearDismissed": true,
-    "saveToHistory": {
-      "low": true,
-      "normal": true,
-      "critical": true
-    },
-    "sounds": {
-      "enabled": false,
-      "volume": 0.5,
-      "separateSounds": false,
-      "criticalSoundFile": "",
-      "normalSoundFile": "",
-      "lowSoundFile": "",
-      "excludedApps": "discord,firefox,chrome,chromium,edge"
-    },
-    "enableMediaToast": false,
-    "enableKeyboardLayoutToast": true,
-    "enableBatteryToast": true
-  },
-  "osd": {
-    "enabled": true,
-    "location": "top_right",
-    "autoHideMs": 2000,
-    "overlayLayer": true,
-    "backgroundOpacity": 1,
-    "enabledTypes": [
-      0,
-      1,
-      2
-    ],
-    "monitors": []
-  },
-  "audio": {
-    "volumeStep": 5,
-    "volumeOverdrive": false,
-    "spectrumFrameRate": 30,
-    "visualizerType": "linear",
-    "spectrumMirrored": true,
-    "mprisBlacklist": [],
-    "preferredPlayer": "",
-    "volumeFeedback": false,
-    "volumeFeedbackSoundFile": ""
-  },
-  "brightness": {
-    "brightnessStep": 5,
-    "enforceMinimum": true,
-    "enableDdcSupport": false,
-    "backlightDeviceMappings": []
-  },
-  "colorSchemes": {
-    "useWallpaperColors": false,
-    "predefinedScheme": "Noctalia (default)",
-    "darkMode": true,
-    "schedulingMode": "off",
-    "manualSunrise": "06:30",
-    "manualSunset": "18:30",
-    "generationMethod": "tonal-spot",
-    "monitorForColors": "",
-    "syncGsettings": true
-  },
-  "templates": {
-    "activeTemplates": [],
-    "enableUserTheming": false
-  },
-  "nightLight": {
-    "enabled": true,
-    "forced": false,
-    "autoSchedule": true,
-    "nightTemp": "4000",
-    "dayTemp": "6500",
-    "manualSunrise": "06:30",
-    "manualSunset": "18:30"
-  },
-  "hooks": {
-    "enabled": false,
-    "wallpaperChange": "",
-    "darkModeChange": "",
-    "screenLock": "",
-    "screenUnlock": "",
-    "performanceModeEnabled": "",
-    "performanceModeDisabled": "",
-    "startup": "",
-    "session": "",
-    "colorGeneration": ""
-  },
-  "plugins": {
-    "autoUpdate": false,
-    "notifyUpdates": true
-  },
-  "idle": {
-    "enabled": false,
-    "screenOffTimeout": 600,
-    "lockTimeout": 660,
-    "suspendTimeout": 1800,
-    "fadeDuration": 5,
-    "screenOffCommand": "",
-    "lockCommand": "",
-    "suspendCommand": "",
-    "resumeScreenOffCommand": "",
-    "resumeLockCommand": "",
-    "resumeSuspendCommand": "",
-    "customCommands": "[]"
-  },
-  "desktopWidgets": {
-    "enabled": false,
-    "overviewEnabled": true,
-    "gridSnap": false,
-    "gridSnapScale": false,
-    "monitorWidgets": []
-  }
-}