gnome fix

16 files changed, 151 insertions, 581 deletions

diff --git a/raveos-calamares-module/PKGBUILD b/raveos-calamares-module/PKGBUILD
index 34ee978..186946e 100644
--- a/raveos-calamares-module/PKGBUILD
+++ b/raveos-calamares-module/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nippy <nippy@tuta.io>
 pkgname=raveos-calamares-module
 pkgver=2.0.0
-pkgrel=37
+pkgrel=38
 pkgdesc="RaveOS Calamares modules: Wi-Fi, Welcome, Desktop Selector, Users"
 arch=('x86_64')
 options=('!debug')
diff --git a/raveos-calamares-module/desktopselect/desktopselect.conf b/raveos-calamares-module/desktopselect/desktopselect.conf
index e809e52..179258e 100644
--- a/raveos-calamares-module/desktopselect/desktopselect.conf
+++ b/raveos-calamares-module/desktopselect/desktopselect.conf
@@ -171,6 +171,7 @@ desktops:
       - hyprwire
       - hyprpaper
       - dms-shell
+      - playerctl
       - raveswitch
       - kitty
       - thunar
diff --git a/raveos-gnome-theme/00-raveos b/raveos-gnome-theme/00-raveos
index 239d3fa..730172a 100644
--- a/raveos-gnome-theme/00-raveos
+++ b/raveos-gnome-theme/00-raveos
@@ -229,7 +229,7 @@ icon-border-radius=16
 icon-spacing=11
 
 [org/gnome/shell/extensions/user-theme]
-name='Yaru-olive-dark'
+name='CustomQuickSettings'
 
 [org/gnome/shell/extensions/vitals]
 hot-sensors=['_processor_usage_', '_memory_allocated_', '__network-rx_max__', '__network-tx_max__']
diff --git a/raveos-gnome-theme/PKGBUILD b/raveos-gnome-theme/PKGBUILD
index 777b10f..6f16c5d 100644
--- a/raveos-gnome-theme/PKGBUILD
+++ b/raveos-gnome-theme/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=raveos-gnome-theme
 pkgver=1.0.0
-pkgrel=11
+pkgrel=12
 pkgdesc="RaveOS GNOME theme payload and installer"
 arch=('any')
 url="https://raveos.local"
@@ -31,6 +31,8 @@ package() {
     install -dm755 "${pkgdir}/usr/share/themes"
     cp -r --no-preserve=ownership "${startdir}/theme-data/user-themes/Yaru-olive-dark" \
         "${pkgdir}/usr/share/themes/"
+    cp -r --no-preserve=ownership "${startdir}/theme-data/user-themes/CustomQuickSettings" \
+        "${pkgdir}/usr/share/themes/"
 
     install -dm755 "${pkgdir}/usr/share/icons"
     cp -r --no-preserve=ownership "${startdir}/theme-data/user-icons/Adwaitaru-olive" \
diff --git a/raveos-gnome-theme/raveos-gnome-apply.sh b/raveos-gnome-theme/raveos-gnome-apply.sh
index 1b9d2a3..31d6994 100755
--- a/raveos-gnome-theme/raveos-gnome-apply.sh
+++ b/raveos-gnome-theme/raveos-gnome-apply.sh
@@ -75,6 +75,14 @@ done
     install -Dm644 "${PAYLOAD}/burn-my-windows/burn-my-windows.conf" \
         /etc/skel/.config/burn-my-windows/profiles/burn-my-windows.conf
 
+for f in gtk-3.0/gtk.css gtk-4.0/gtk.css; do
+    [[ -f "${PAYLOAD}/${f}" ]] && install -Dm644 "${PAYLOAD}/${f}" "/etc/skel/.config/${f}"
+done
+
+[[ -f "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" ]] && \
+    install -Dm644 "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" \
+        /etc/skel/.local/share/flatpak/overrides/global
+
 write_mimeapps_defaults /etc/skel/.config/mimeapps.list
 ensure_bashrc_hook /etc/skel/.bashrc
 echo "1" > /etc/skel/.config/raveos/gnome-migrated
@@ -105,6 +113,19 @@ while IFS=: read -r user _ uid gid _ home shell; do
             "${home}/.config/burn-my-windows/profiles/burn-my-windows.conf"
     fi
 
+    for f in gtk-3.0/gtk.css gtk-4.0/gtk.css; do
+        if [[ ! -f "${home}/.config/${f}" && -f "${PAYLOAD}/${f}" ]]; then
+            install -Dm644 "${PAYLOAD}/${f}" "${home}/.config/${f}"
+        fi
+    done
+
+    if command -v flatpak >/dev/null 2>&1; then
+        runuser -u "$user" -- env HOME="$home" flatpak override --user --filesystem=xdg-config/gtk-4.0:ro 2>/dev/null || true
+    elif [[ ! -f "${home}/.local/share/flatpak/overrides/global" && -f "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" ]]; then
+        install -Dm644 "${PAYLOAD}/skel/.local/share/flatpak/overrides/global" \
+            "${home}/.local/share/flatpak/overrides/global"
+    fi
+
     if [[ ! -f "${home}/.config/mimeapps.list" ]]; then
         write_mimeapps_defaults "${home}/.config/mimeapps.list"
     fi
@@ -118,6 +139,8 @@ while IFS=: read -r user _ uid gid _ home shell; do
         .config/kitty \
         .config/fastfetch \
         .config/burn-my-windows \
+        .config/gtk-3.0 \
+        .config/gtk-4.0 \
         .config/raveos; do
         [[ -e "${home}/${d}" ]] && chown -R "${uid}:${gid}" "${home}/${d}" 2>/dev/null || true
     done
diff --git a/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css b/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css
new file mode 100644
index 0000000..9146bac
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/gtk-3.0/gtk.css
@@ -0,0 +1,3 @@
+@define-color accent_bg_color #3d7839;
+@define-color accent_fg_color #ffffff;
+@define-color accent_color #3d7839;
diff --git a/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css b/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css
new file mode 100644
index 0000000..cfeb241
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/gtk-4.0/gtk.css
@@ -0,0 +1,11 @@
+/* --- Modern Libadwaita (GNOME 47+) --- */                                             
+    :root {                                                                                 
+        --accent-bg-color: #3d7839; /* Accent fill (active buttons, switches, selections) */
+        --accent-fg-color: #ffffff; /* Foreground text/icon color on top of accent fill */  
+        --accent-color: #3d7839;    /* Standalone accent color (text, links, icons) */      
+    }                                                                                       
+                                                                                            
+    /* --- Legacy Libadwaita / GTK4 fallback --- */                                         
+    @define-color accent_bg_color #3d7839;                                                  
+    @define-color accent_fg_color #ffffff;                                                  
+    @define-color accent_color #3d7839;
diff --git a/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global b/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global
new file mode 100644
index 0000000..c6b726f
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/skel/.local/share/flatpak/overrides/global
@@ -0,0 +1,2 @@
+[Context]
+filesystems=xdg-config/gtk-4.0:ro;
diff --git a/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css b/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css
new file mode 100644
index 0000000..b303442
--- /dev/null
+++ b/raveos-gnome-theme/theme-data/user-themes/CustomQuickSettings/gnome-shell/gnome-shell.css
@@ -0,0 +1,19 @@
+/* Load the default GNOME Shell stylesheet */                                           
+    @import url("resource:///org/gnome/shell/theme/gnome-shell.css");                       
+                                                                                            
+    /* Active Quick Settings toggle buttons (Wi-Fi, Bluetooth, Dark Mode, etc.) */          
+    .quick-toggle:checked,                                                                  
+    .quick-menu-toggle:checked {                                                            
+        background-color: #3d7839 !important;                                               
+        color: #ffffff !important;                                                          
+    }                                                                                       
+                                                                                            
+    /* Dropdown arrow on split toggle buttons */                                            
+    .quick-menu-toggle:checked .quick-toggle-arrow {                                        
+        background-color: #3d7839 !important;                                               
+    }                                                                                       
+                                                                                            
+    /* Volume and brightness slider active fills */                                         
+    .slider {                                                                               
+        -barlevel-active-background-color: #3d7839 !important;                              
+    }
diff --git a/raveos-hyprland-theme/.SRCINFO b/raveos-hyprland-theme/.SRCINFO
index e0ded2a..56e4072 100644
--- a/raveos-hyprland-theme/.SRCINFO
+++ b/raveos-hyprland-theme/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = raveos-hyprland-theme
 	pkgdesc = RaveOS Hyprland theme payload and installer
 	pkgver = 1.0.0
-	pkgrel = 13
+	pkgrel = 14
 	url = https://raveos.local
 	install = raveos-hyprland-theme.install
 	arch = any
diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD
index da80b5a..6af848e 100644
--- a/raveos-hyprland-theme/PKGBUILD
+++ b/raveos-hyprland-theme/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=raveos-hyprland-theme
 pkgver=1.0.0
-pkgrel=13
+pkgrel=14
 pkgdesc="RaveOS Hyprland theme payload and installer"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-hyprland-theme/raveos-hyprland-apply.sh b/raveos-hyprland-theme/raveos-hyprland-apply.sh
index a66ce0b..7f18a12 100644
--- a/raveos-hyprland-theme/raveos-hyprland-apply.sh
+++ b/raveos-hyprland-theme/raveos-hyprland-apply.sh
@@ -259,6 +259,53 @@ while IFS=: read -r user _ uid gid _ home shell; do
         install -Dm644 "${PAYLOAD}/hypr/config/windowrules.lua" "${home}/.config/hypr/config/windowrules.lua"
     fi
 
+    if [[ -f "${home}/.config/hypr/config/windowrules.lua" ]]; then
+        if ! grep -q 'obs-render-unfocused' "${home}/.config/hypr/config/windowrules.lua" 2>/dev/null; then
+            cat >> "${home}/.config/hypr/config/windowrules.lua" << 'WREOF'
+
+hl.window_rule({
+    name  = "obs-render-unfocused",
+    match = {
+        class = "^(.*obs.*|com.obsproject.Studio)$",
+    },
+    render_unfocused = true,
+})
+WREOF
+        fi
+        if ! grep -q 'kitty-terminal' "${home}/.config/hypr/config/windowrules.lua" 2>/dev/null; then
+            cat >> "${home}/.config/hypr/config/windowrules.lua" << 'WREOF'
+
+hl.window_rule({
+    name  = "kitty-terminal",
+    match = {
+        class = "kitty",
+    },
+    size = "1280 720",
+})
+WREOF
+        fi
+    fi
+
+    if [[ -f "${home}/.config/hypr/hyprland.lua" ]] && ! grep -q 'render_unfocused_fps' "${home}/.config/hypr/hyprland.lua" 2>/dev/null; then
+        cat >> "${home}/.config/hypr/hyprland.lua" << 'HLEOF'
+
+hl.config({
+    misc = {
+        render_unfocused_fps = 60,
+    },
+})
+HLEOF
+    fi
+
+    if [[ -f "${home}/.config/kitty/kitty.conf" ]] && ! grep -q 'remember_window_size' "${home}/.config/kitty/kitty.conf" 2>/dev/null; then
+        printf 'remember_window_size no\n' >> "${home}/.config/kitty/kitty.conf"
+    fi
+
+    chown "${uid}:${gid}" \
+        "${home}/.config/hypr/hyprland.lua" \
+        "${home}/.config/hypr/config/windowrules.lua" \
+        "${home}/.config/kitty/kitty.conf" 2>/dev/null || true
+
     if [[ ! -f "${home}/.config/hypr/hyprpaper.conf" ]]; then
         printf 'preload = %s/.config/background.jpg\nwallpaper = ,%s/.config/background.jpg\nsplash = false\n' \
             "$home" "$home" > "${home}/.config/hypr/hyprpaper.conf"
diff --git a/raveos-hyprland-theme/theme-data/DankMaterialShell/settings.json b/raveos-hyprland-theme/theme-data/DankMaterialShell/settings.json
index b517bdf..d75b057 100644
--- a/raveos-hyprland-theme/theme-data/DankMaterialShell/settings.json
+++ b/raveos-hyprland-theme/theme-data/DankMaterialShell/settings.json
@@ -1,119 +1,8 @@
 {
   "currentThemeName": "green",
-  "currentThemeCategory": "generic",
-  "customThemeFile": "",
-  "registryThemeVariants": {},
-  "matugenScheme": "scheme-tonal-spot",
-  "matugenContrast": 0,
-  "runUserMatugenTemplates": true,
-  "matugenTargetMonitor": "",
-  "popupTransparency": 1,
   "dockTransparency": 0.55,
-  "widgetBackgroundColor": "sch",
-  "widgetBackgroundCustomColor": "#6750A4",
-  "widgetBackgroundCustomStrength": 0.5,
-  "widgetColorMode": "default",
-  "controlCenterTileColorMode": "primary",
-  "buttonColorMode": "primary",
   "cornerRadius": 12,
-  "niriLayoutGapsOverride": -1,
-  "niriLayoutRadiusOverride": -1,
-  "niriLayoutBorderSize": -1,
-  "hyprlandLayoutGapsOverride": -1,
-  "hyprlandLayoutGapsOutOverride": -1,
-  "hyprlandLayoutRadiusOverride": -1,
-  "hyprlandLayoutBorderSize": -1,
-  "hyprlandResizeOnBorder": false,
-  "mangoLayoutGapsOverride": -1,
-  "mangoLayoutGapsOutOverride": -1,
-  "mangoLayoutRadiusOverride": -1,
-  "mangoLayoutBorderSize": -1,
-  "mangoTrackpadNaturalScrolling": true,
-  "firstDayOfWeek": -1,
-  "showWeekNumber": false,
-  "calendarBackend": "auto",
-  "clockFormat": "auto",
-  "showSeconds": false,
-  "padHours12Hour": false,
-  "useFahrenheit": false,
-  "windSpeedUnit": "kmh",
-  "nightModeEnabled": false,
-  "animationSpeed": 1,
-  "customAnimationDuration": 500,
-  "syncComponentAnimationSpeeds": true,
-  "popoutAnimationSpeed": 1,
-  "popoutCustomAnimationDuration": 150,
-  "modalAnimationSpeed": 1,
-  "modalCustomAnimationDuration": 150,
-  "enableRippleEffects": true,
-  "animationVariant": 0,
-  "motionEffect": 0,
-  "m3ElevationEnabled": true,
-  "m3ElevationIntensity": 12,
-  "m3ElevationOpacity": 30,
-  "m3ElevationColorMode": "default",
-  "m3ElevationLightDirection": "top",
-  "m3ElevationCustomColor": "#000000",
-  "modalElevationEnabled": true,
-  "popoutElevationEnabled": true,
-  "barElevationEnabled": true,
-  "blurEnabled": false,
-  "blurForegroundLayers": true,
-  "blurLayerOutlineOpacity": 0.12,
-  "blurBorderEnabled": true,
-  "blurBorderColor": "outline",
-  "blurBorderCustomColor": "#ffffff",
-  "blurBorderOpacity": 0.35,
-  "wallpaperFillMode": "Fill",
-  "blurredWallpaperLayer": false,
-  "blurWallpaperOnOverview": false,
-  "wallpaperBackgroundColorMode": "black",
-  "wallpaperBackgroundCustomColor": "#000000",
-  "showLauncherButton": true,
-  "showWorkspaceSwitcher": true,
-  "showFocusedWindow": true,
-  "showWeather": true,
-  "showMusic": true,
-  "showClipboard": true,
-  "showCpuUsage": true,
-  "showMemUsage": true,
-  "showCpuTemp": true,
-  "showGpuTemp": true,
-  "selectedGpuIndex": 0,
-  "enabledGpuPciIds": [],
-  "showSystemTray": true,
-  "systemTrayIconTintMode": "none",
-  "systemTrayIconTintSaturation": 50,
-  "systemTrayIconTintStrength": 135,
-  "showClock": true,
-  "showNotificationButton": true,
-  "showBattery": true,
-  "showBatteryPercent": true,
-  "showBatteryPercentOnlyOnBattery": false,
-  "showBatteryTime": false,
-  "showBatteryTimeOnlyOnBattery": false,
-  "batteryPillStyle": false,
-  "batteryPillPercentSign": false,
-  "showControlCenterButton": true,
-  "showCapsLockIndicator": true,
-  "controlCenterShowNetworkIcon": true,
-  "controlCenterShowBluetoothIcon": true,
-  "controlCenterShowAudioIcon": true,
-  "controlCenterShowAudioPercent": false,
-  "controlCenterShowVpnIcon": true,
-  "controlCenterShowBrightnessIcon": false,
-  "controlCenterShowBrightnessPercent": false,
-  "controlCenterShowMicIcon": false,
   "controlCenterShowMicPercent": true,
-  "controlCenterShowBatteryIcon": false,
-  "controlCenterShowPrinterIcon": false,
-  "controlCenterShowScreenSharingIcon": true,
-  "controlCenterShowIdleInhibitorIcon": false,
-  "controlCenterShowDoNotDisturbIcon": false,
-  "showPrivacyButton": true,
-  "privacyShowMicIcon": false,
-  "privacyShowCameraIcon": false,
-  "privacyShowScreenShareIcon": false,
   "controlCenterWidgets": [
     {
       "id": "volumeSlider",
@@ -126,12 +15,7 @@
       "width": 50
     },
     {
-      "id": "wifi",
-      "enabled": true,
-      "width": 50
-    },
-    {
-      "id": "bluetooth",
+      "id": "audioInput",
       "enabled": true,
       "width": 50
     },
@@ -141,7 +25,7 @@
       "width": 50
     },
     {
-      "id": "audioInput",
+      "id": "wifi",
       "enabled": true,
       "width": 50
     },
@@ -149,159 +33,14 @@
       "id": "nightMode",
       "enabled": true,
       "width": 50
-    },
-    {
-      "id": "darkMode",
-      "enabled": true,
-      "width": 50
     }
   ],
-  "showWorkspaceIndex": false,
-  "showWorkspaceName": false,
-  "showWorkspacePadding": false,
-  "workspaceScrolling": false,
-  "showWorkspaceApps": false,
-  "workspaceDragReorder": true,
-  "maxWorkspaceIcons": 3,
-  "workspaceAppIconSizeOffset": 0,
-  "groupWorkspaceApps": true,
-  "groupActiveWorkspaceApps": false,
-  "workspaceFollowFocus": false,
-  "showOccupiedWorkspacesOnly": false,
-  "reverseScrolling": false,
-  "dwlShowAllTags": false,
-  "workspaceActiveAppHighlightEnabled": false,
-  "workspaceColorMode": "default",
-  "workspaceFocusedCustomColor": "#6750A4",
-  "workspaceOccupiedColorMode": "none",
-  "workspaceOccupiedCustomColor": "#625B71",
-  "workspaceUnfocusedColorMode": "default",
-  "workspaceUnfocusedCustomColor": "#49454E",
-  "workspaceUrgentColorMode": "default",
-  "workspaceUrgentCustomColor": "#B3261E",
-  "workspaceFocusedBorderEnabled": false,
-  "workspaceFocusedBorderColor": "primary",
-  "workspaceFocusedBorderCustomColor": "#6750A4",
-  "workspaceFocusedBorderThickness": 2,
-  "workspaceUnfocusedMonitorSeparateAppearance": false,
-  "workspaceUnfocusedMonitorColorMode": "default",
-  "workspaceUnfocusedMonitorFocusedCustomColor": "#6750A4",
-  "workspaceUnfocusedMonitorOccupiedColorMode": "none",
-  "workspaceUnfocusedMonitorOccupiedCustomColor": "#625B71",
-  "workspaceUnfocusedMonitorUnfocusedColorMode": "default",
-  "workspaceUnfocusedMonitorUnfocusedCustomColor": "#49454E",
-  "workspaceUnfocusedMonitorUrgentColorMode": "default",
-  "workspaceUnfocusedMonitorUrgentCustomColor": "#B3261E",
-  "workspaceUnfocusedMonitorBorderEnabled": false,
-  "workspaceUnfocusedMonitorBorderColor": "primary",
-  "workspaceUnfocusedMonitorBorderCustomColor": "#6750A4",
-  "workspaceUnfocusedMonitorBorderThickness": 2,
-  "workspaceNameIcons": {},
-  "waveProgressEnabled": true,
-  "scrollTitleEnabled": true,
-  "mediaAdaptiveWidthEnabled": true,
-  "audioVisualizerEnabled": true,
-  "mediaUseAlbumArtAccent": false,
-  "audioScrollMode": "volume",
-  "audioWheelScrollAmount": 5,
-  "audioDeviceScrollVolumeEnabled": false,
-  "mediaExcludePlayers": [],
-  "clockCompactMode": false,
-  "focusedWindowCompactMode": false,
-  "focusedWindowSize": 1,
-  "focusedWindowShowIcon": true,
-  "runningAppsCompactMode": true,
-  "barMaxVisibleApps": 0,
-  "barMaxVisibleRunningApps": 0,
-  "barShowOverflowBadge": true,
-  "trayAutoOverflow": true,
-  "trayPopupSingleLine": true,
-  "trayMaxVisibleItems": 0,
-  "appsDockHideIndicators": false,
-  "appsDockColorizeActive": false,
-  "appsDockActiveColorMode": "primary",
-  "appsDockEnlargeOnHover": false,
-  "appsDockEnlargePercentage": 125,
-  "appsDockIconSizePercentage": 100,
-  "keyboardLayoutNameCompactMode": false,
-  "keyboardLayoutNameShowIcon": false,
-  "runningAppsCurrentWorkspace": true,
-  "runningAppsGroupByApp": false,
-  "runningAppsCurrentMonitor": false,
   "appIdSubstitutions": [],
-  "centeringMode": "index",
   "clockDateFormat": "ddd MMM d",
-  "lockDateFormat": "",
-  "greeterRememberLastSession": true,
-  "greeterRememberLastUser": true,
-  "greeterAutoLogin": false,
-  "greeterEnableFprint": false,
-  "greeterEnableU2f": false,
-  "greeterWallpaperPath": "",
-  "greeterLockDateFormat": "",
-  "greeterFontFamily": "",
-  "greeterWallpaperFillMode": "",
-  "greeterPamExternallyManaged": false,
-  "greeterSyncPending": false,
-  "greeterSyncBaseline": {},
-  "mediaSize": 1,
-  "appLauncherViewMode": "list",
-  "spotlightModalViewMode": "list",
-  "browserPickerViewMode": "grid",
-  "browserUsageHistory": {},
-  "appPickerViewMode": "grid",
-  "filePickerUsageHistory": {},
-  "sortAppsAlphabetically": false,
-  "appLauncherGridColumns": 4,
-  "spotlightCloseNiriOverview": true,
-  "rememberLastQuery": false,
-  "rememberLastMode": true,
-  "spotlightSectionViewModes": {},
-  "appDrawerSectionViewModes": {},
-  "niriOverviewOverlayEnabled": true,
-  "niriOverviewLauncherStyle": "full",
-  "dankLauncherV2Size": "compact",
-  "dankLauncherV2ShowSourceBadges": true,
   "dankLauncherV2BorderEnabled": true,
   "dankLauncherV2BorderThickness": 3,
-  "dankLauncherV2BorderColor": "primary",
-  "dankLauncherV2ShowFooter": true,
-  "dankLauncherV2UnloadOnClose": false,
-  "dankLauncherV2IncludeFilesInAll": false,
-  "dankLauncherV2IncludeFoldersInAll": false,
-  "launcherUseOverlayLayer": false,
-  "launcherStyle": "full",
-  "spotlightBarShowModeChips": false,
-  "keybindsFloatingWindow": false,
-  "useAutoLocation": false,
-  "weatherEnabled": true,
-  "dashTabs": [
-    {
-      "id": "overview",
-      "enabled": true
-    },
-    {
-      "id": "media",
-      "enabled": true
-    },
-    {
-      "id": "wallpaper",
-      "enabled": true
-    },
-    {
-      "id": "weather",
-      "enabled": true
-    },
-    {
-      "id": "settings",
-      "enabled": true
-    }
-  ],
-  "networkPreference": "auto",
+  "weatherEnabled": false,
   "iconThemeDark": "Adwaitaru-olive",
-  "iconThemeLight": "System Default",
-  "iconThemePerMode": false,
-  "lastAppliedIconTheme": "Adwaitaru-olive",
   "cursorSettings": {
     "theme": "System Default",
     "size": 24,
@@ -318,245 +57,21 @@
       "cursorHideTimeout": 0
     }
   },
-  "launcherLogoMode": "apps",
-  "launcherLogoCustomPath": "",
-  "launcherLogoColorOverride": "",
-  "launcherLogoColorInvertOnMode": false,
-  "launcherLogoBrightness": 0.5,
-  "launcherLogoContrast": 1,
-  "launcherLogoSizeOffset": 0,
-  "fontFamily": "Inter Variable",
-  "monoFontFamily": "Fira Code",
-  "fontWeight": 400,
-  "fontScale": 1,
-  "textRenderType": 0,
-  "textRenderQuality": 0,
-  "notepadUseMonospace": true,
-  "notepadFontFamily": "",
-  "notepadFontSize": 14,
-  "notificationSummaryFontSize": 0,
-  "notificationBodyFontSize": 0,
-  "notepadShowLineNumbers": false,
+  "fontWeight": 700,
   "notepadAutoSave": true,
-  "notepadSlideoutSide": "right",
-  "notepadDefaultMode": "slideout",
   "notepadTransparencyOverride": 0.55,
   "notepadLastCustomTransparency": 0.55,
-  "notepadUseCompositorGap": false,
   "notepadEdgeGap": 11,
-  "soundsEnabled": true,
-  "useSystemSoundTheme": false,
-  "soundLogin": false,
-  "soundNewNotification": true,
-  "soundVolumeChanged": true,
-  "soundPluggedIn": true,
-  "muteSoundsWhenMediaPlaying": true,
-  "acMonitorTimeout": 0,
-  "acLockTimeout": 0,
-  "acSuspendTimeout": 0,
-  "acSuspendBehavior": 0,
-  "acProfileName": "",
-  "acPostLockMonitorTimeout": 0,
-  "batteryMonitorTimeout": 0,
-  "batteryLockTimeout": 0,
-  "batterySuspendTimeout": 0,
-  "batterySuspendBehavior": 0,
-  "batteryProfileName": "",
-  "batteryPostLockMonitorTimeout": 0,
-  "batteryChargeLimit": 100,
-  "batteryNotifyChargeLimit": false,
-  "batteryCriticalThreshold": 10,
-  "batteryNotifyCritical": true,
-  "batteryLowThreshold": 20,
-  "batteryNotifyLow": false,
-  "batteryChargeLimitNotificationType": 0,
-  "batteryLowNotificationType": 0,
-  "batteryCriticalNotificationType": 1,
-  "batteryAutoPowerSaver": false,
-  "lockBeforeSuspend": false,
-  "loginctlLockIntegration": true,
-  "fadeToLockEnabled": true,
-  "fadeToLockGracePeriod": 5,
-  "fadeToDpmsEnabled": true,
-  "fadeToDpmsGracePeriod": 5,
-  "launchPrefix": "",
-  "brightnessDevicePins": {},
-  "wifiNetworkPins": {},
-  "bluetoothDevicePins": {},
-  "audioInputDevicePins": {},
-  "audioOutputDevicePins": {},
-  "gtkThemingEnabled": false,
-  "qtThemingEnabled": false,
-  "syncModeWithPortal": true,
-  "terminalsAlwaysDark": false,
-  "muxType": "tmux",
-  "muxUseCustomCommand": false,
-  "muxCustomCommand": "",
-  "muxSessionFilter": "",
-  "runDmsMatugenTemplates": true,
-  "matugenTemplateGtk": true,
-  "matugenTemplateNiri": true,
-  "matugenTemplateHyprland": true,
-  "matugenTemplateMangowc": true,
-  "matugenTemplateQt5ct": true,
-  "matugenTemplateQt6ct": true,
-  "matugenTemplateFirefox": true,
-  "matugenTemplatePywalfox": true,
-  "matugenTemplateZenBrowser": true,
-  "matugenTemplateVesktop": true,
-  "matugenTemplateVencord": true,
-  "matugenTemplateEquibop": true,
-  "matugenTemplateGhostty": true,
-  "matugenTemplateKitty": true,
-  "matugenTemplateFoot": true,
-  "matugenTemplateAlacritty": true,
-  "matugenTemplateNeovim": false,
-  "matugenTemplateWezterm": true,
-  "matugenTemplateDgop": true,
-  "matugenTemplateKcolorscheme": true,
-  "matugenTemplateVscode": true,
-  "matugenTemplateEmacs": true,
-  "matugenTemplateZed": true,
-  "matugenTemplateNeovimSettings": {
-    "dark": {
-      "baseTheme": "github_dark",
-      "harmony": 0.5
-    },
-    "light": {
-      "baseTheme": "github_light",
-      "harmony": 0.5
-    }
-  },
-  "matugenTemplateNeovimSetBackground": true,
   "showDock": true,
-  "dockAutoHide": false,
-  "dockSmartAutoHide": true,
-  "dockUseOverlayLayer": false,
-  "dockGroupByApp": false,
-  "dockRestoreSpecialWorkspaceOnClick": false,
-  "dockOpenOnOverview": false,
-  "dockPosition": 2,
+  "dockAutoHide": true,
   "dockSpacing": 7,
-  "dockBottomGap": 0,
-  "dockMargin": 0,
   "dockIconSize": 44,
-  "dockIndicatorStyle": "circle",
   "dockBorderEnabled": true,
   "dockBorderColor": "primary",
   "dockBorderOpacity": 0.44,
-  "dockBorderThickness": 1,
-  "dockIsolateDisplays": false,
+  "dockIsolateDisplays": true,
   "dockLauncherEnabled": true,
-  "dockLauncherLogoMode": "apps",
-  "dockLauncherLogoCustomPath": "",
-  "dockLauncherLogoColorOverride": "",
-  "dockLauncherLogoSizeOffset": 0,
-  "dockLauncherLogoBrightness": 0.5,
-  "dockLauncherLogoContrast": 1,
-  "dockMaxVisibleApps": 0,
-  "dockMaxVisibleRunningApps": 0,
-  "dockShowOverflowBadge": true,
-  "dockShowTrash": false,
-  "dockTrashFileManager": "default",
-  "dockTrashCustomCommand": "",
-  "notificationOverlayEnabled": false,
-  "notificationPopupShadowEnabled": true,
-  "notificationPopupPrivacyMode": false,
-  "notificationForegroundLayers": true,
-  "modalDarkenBackground": true,
-  "lockScreenShowPowerActions": true,
-  "lockScreenShowSystemIcons": true,
-  "lockScreenShowTime": true,
-  "lockScreenShowDate": true,
-  "lockScreenShowProfileImage": true,
-  "lockScreenShowPasswordField": true,
-  "lockScreenShowMediaPlayer": true,
-  "lockScreenPowerOffMonitorsOnLock": false,
-  "lockAtStartup": false,
-  "enableFprint": false,
-  "maxFprintTries": 15,
-  "enableU2f": false,
-  "u2fMode": "or",
-  "lockPamPath": "",
-  "lockPamInlineFprint": false,
-  "lockPamInlineU2f": false,
-  "lockPamExternallyManaged": false,
-  "lockU2fPamPath": "",
-  "lockScreenInactiveColor": "#000000",
-  "lockScreenNotificationMode": 0,
-  "lockScreenVideoEnabled": false,
-  "lockScreenVideoPath": "",
-  "lockScreenVideoCycling": false,
-  "lockScreenWallpaperPath": "",
-  "lockScreenWallpaperFillMode": "",
-  "lockScreenFontFamily": "",
-  "hideBrightnessSlider": false,
-  "notificationTimeoutLow": 5000,
-  "notificationTimeoutNormal": 5000,
-  "notificationTimeoutCritical": 0,
-  "notificationCompactMode": false,
-  "notificationShowTimeoutBar": false,
-  "notificationDedupeEnabled": true,
-  "notificationPopupPosition": 0,
-  "notificationAnimationSpeed": 1,
-  "notificationCustomAnimationDuration": 400,
-  "notificationHistoryEnabled": true,
-  "notificationHistoryMaxCount": 50,
-  "notificationHistoryMaxAgeDays": 7,
-  "notificationHistorySaveLow": true,
-  "notificationHistorySaveNormal": true,
-  "notificationHistorySaveCritical": true,
-  "notificationRules": [],
-  "notificationFocusedMonitor": false,
-  "osdAlwaysShowValue": false,
-  "osdPosition": 5,
-  "osdVolumeEnabled": true,
-  "osdMediaVolumeEnabled": true,
-  "osdMediaPlaybackEnabled": false,
-  "osdBrightnessEnabled": true,
-  "osdIdleInhibitorEnabled": true,
-  "osdMicMuteEnabled": true,
-  "osdCapsLockEnabled": true,
   "osdPowerProfileEnabled": true,
-  "osdAudioOutputEnabled": true,
-  "powerActionConfirm": true,
-  "powerActionHoldDuration": 0.5,
-  "powerMenuActions": [
-    "reboot",
-    "logout",
-    "poweroff",
-    "lock",
-    "suspend",
-    "restart"
-  ],
-  "powerMenuDefaultAction": "logout",
-  "powerMenuGridLayout": false,
-  "customPowerActionLock": "",
-  "customPowerActionLogout": "",
-  "customPowerActionSuspend": "",
-  "customPowerActionHibernate": "",
-  "customPowerActionReboot": "",
-  "customPowerActionPowerOff": "",
-  "updaterHideWidget": false,
-  "updaterCheckOnStart": false,
-  "updaterUseCustomCommand": false,
-  "updaterCustomCommand": "",
-  "updaterTerminalAdditionalParams": "",
-  "updaterIntervalSeconds": 1800,
-  "updaterIncludeFlatpak": true,
-  "updaterAllowAUR": true,
-  "updaterIgnoredPackages": [],
-  "displayNameMode": "system",
-  "screenPreferences": {},
-  "showOnLastDisplay": {},
-  "niriOutputSettings": {},
-  "hyprlandOutputSettings": {},
-  "displayProfiles": {},
-  "activeDisplayProfile": {},
-  "displayProfileAutoSelect": false,
-  "displayShowDisconnected": false,
-  "displaySnapToEdge": true,
-  "connectedFrameBarStyleBackups": {},
   "barConfigs": [
     {
       "id": "default",
@@ -564,7 +79,10 @@
       "enabled": true,
       "position": 0,
       "screenPreferences": [
-        "all"
+        {
+          "name": "DP-1",
+          "model": "LG ULTRAGEAR"
+        }
       ],
       "showOnLastDisplay": true,
       "leftWidgets": [
@@ -589,7 +107,7 @@
           "id": "gpuTemp",
           "enabled": true,
           "selectedGpuIndex": 0,
-          "pciId": "8086:3e92"
+          "pciId": "1002:73bf"
         },
         {
           "id": "network_speed_monitor",
@@ -612,17 +130,17 @@
         "controlCenterButton"
       ],
       "spacing": 0,
-      "innerPadding": -3,
-      "barInsetPadding": -1,
+      "innerPadding": 0,
+      "barInsetPadding": 4,
       "bottomGap": 0,
-      "transparency": 0.33,
+      "transparency": 0.44,
       "widgetTransparency": 0.6,
       "squareCorners": true,
       "noBackground": false,
       "maximizeWidgetIcons": false,
       "maximizeWidgetText": false,
       "removeWidgetPadding": false,
-      "widgetPadding": 11,
+      "widgetPadding": 8,
       "gothCornersEnabled": false,
       "gothCornerRadiusOverride": false,
       "gothCornerRadiusValue": 12,
@@ -634,8 +152,8 @@
       "widgetOutlineColor": "primary",
       "widgetOutlineOpacity": 0.35,
       "widgetOutlineThickness": 1,
-      "fontScale": 1.11,
-      "iconScale": 1.11,
+      "fontScale": 1.27,
+      "iconScale": 1.24,
       "autoHide": false,
       "autoHideStrict": false,
       "autoHideDelay": 250,
@@ -655,13 +173,10 @@
       "shadowCustomColor": "#000000",
       "clickThrough": false,
       "hoverPopouts": false,
-      "hoverPopoutDelay": 222
+      "hoverPopoutDelay": 222,
+      "barLengthPadding": 0
     }
   ],
-  "desktopClockEnabled": false,
-  "desktopClockStyle": "analog",
-  "desktopClockTransparency": 0.8,
-  "desktopClockColorMode": "primary",
   "desktopClockCustomColor": {
     "r": 1,
     "g": 1,
@@ -675,20 +190,6 @@
     "hslLightness": 1,
     "valid": true
   },
-  "desktopClockShowDate": true,
-  "desktopClockShowAnalogNumbers": false,
-  "desktopClockShowAnalogSeconds": true,
-  "desktopClockX": -1,
-  "desktopClockY": -1,
-  "desktopClockWidth": 280,
-  "desktopClockHeight": 180,
-  "desktopClockDisplayPreferences": [
-    "all"
-  ],
-  "systemMonitorEnabled": false,
-  "systemMonitorShowHeader": true,
-  "systemMonitorTransparency": 0.8,
-  "systemMonitorColorMode": "primary",
   "systemMonitorCustomColor": {
     "r": 1,
     "g": 1,
@@ -702,33 +203,6 @@
     "hslLightness": 1,
     "valid": true
   },
-  "systemMonitorShowCpu": true,
-  "systemMonitorShowCpuGraph": true,
-  "systemMonitorShowCpuTemp": true,
-  "systemMonitorShowGpuTemp": false,
-  "systemMonitorGpuPciId": "",
-  "systemMonitorShowMemory": true,
-  "systemMonitorShowMemoryGraph": true,
-  "systemMonitorShowNetwork": true,
-  "systemMonitorShowNetworkGraph": true,
-  "systemMonitorShowDisk": true,
-  "systemMonitorShowTopProcesses": false,
-  "systemMonitorTopProcessCount": 3,
-  "systemMonitorTopProcessSortBy": "cpu",
-  "systemMonitorGraphInterval": 60,
-  "systemMonitorLayoutMode": "auto",
-  "systemMonitorX": -1,
-  "systemMonitorY": -1,
-  "systemMonitorWidth": 320,
-  "systemMonitorHeight": 480,
-  "systemMonitorDisplayPreferences": [
-    "all"
-  ],
-  "systemMonitorVariants": [],
-  "desktopWidgetPositions": {},
-  "desktopWidgetGridSettings": {},
-  "desktopWidgetInstances": [],
-  "desktopWidgetGroups": [],
   "builtInPluginSettings": {
     "dms_settings_search": {
       "trigger": "?"
@@ -737,35 +211,5 @@
       "trigger": "cb"
     }
   },
-  "clipboardClickToPaste": false,
-  "clipboardEnterToPaste": false,
-  "clipboardRememberTypeFilter": false,
-  "clipboardTypeFilter": "all",
-  "clipboardVisibleEntryActions": [
-    "pin",
-    "edit",
-    "delete"
-  ],
-  "launcherPluginVisibility": {},
-  "launcherPluginOrder": [],
-  "frameEnabled": false,
-  "frameThickness": 16,
-  "frameRounding": 23,
-  "frameColor": "",
-  "frameOpacity": 1,
-  "frameScreenPreferences": [
-    "all"
-  ],
-  "frameBarSize": 40,
-  "frameShowOnOverview": false,
-  "frameBlurEnabled": true,
-  "frameCloseGaps": true,
-  "frameLauncherEmergeSide": "bottom",
-  "frameLauncherArcExtender": false,
-  "frameLauncherEdgeHover": false,
-  "frameMode": "connected",
-  "barInsetPaddingShared": -1,
-  "barInsetPaddingSyncAll": false,
-  "frameBarInsetPadding": -1,
-  "configVersion": 12
+  "configVersion": 18
 }
\ No newline at end of file
diff --git a/raveos-hyprland-theme/theme-data/hypr/config/windowrules.lua b/raveos-hyprland-theme/theme-data/hypr/config/windowrules.lua
index 811b79e..25a2c1e 100644
--- a/raveos-hyprland-theme/theme-data/hypr/config/windowrules.lua
+++ b/raveos-hyprland-theme/theme-data/hypr/config/windowrules.lua
@@ -103,3 +103,19 @@ hl.window_rule({
     move  = { 20, "monitor_h-120" },
     float = true,
 })
+
+hl.window_rule({
+    name  = "obs-render-unfocused",
+    match = {
+        class = "^(.*obs.*|com.obsproject.Studio)$",
+    },
+    render_unfocused = true,
+})
+
+hl.window_rule({
+    name  = "kitty-terminal",
+    match = {
+        class = "kitty",
+    },
+    size = "1280 720",
+})
diff --git a/raveos-hyprland-theme/theme-data/hypr/hyprland.lua b/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
index b44bb93..a5a9206 100644
--- a/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
+++ b/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
@@ -158,6 +158,7 @@ hl.config({
     misc = {
         force_default_wallpaper = -1,
         disable_hyprland_logo   = false,
+        render_unfocused_fps    = 60,
     },
 })
 
diff --git a/raveos-hyprland-theme/theme-data/kitty/kitty.conf b/raveos-hyprland-theme/theme-data/kitty/kitty.conf
index 7c86425..1280416 100644
--- a/raveos-hyprland-theme/theme-data/kitty/kitty.conf
+++ b/raveos-hyprland-theme/theme-data/kitty/kitty.conf
@@ -5,3 +5,4 @@ bold_italic_font auto
 
 background_opacity 0.5
 background_blur 1
+remember_window_size no