Merge pull request #419 from JaKooLit/development

Development to Main. Preparation for release

17 files changed, 133 insertions, 99 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index 2ec6b4ea..5bfa5ab1 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -1,6 +1,9 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
 # Environment variables. See https://wiki.hyprland.org/Configuring/Environment-variables/
 
+# Set your defaults here
+#env = EDITOR,vim #default editor
+
 #environment-variables
 env = CLUTTER_BACKEND,wayland
 env = GDK_BACKEND,wayland,x11
@@ -17,7 +20,7 @@ env = XDG_SESSION_TYPE,wayland
 # xwayland apps scale fix (useful if you are use monitor scaling)
 # see https://wiki.hyprland.org/Configuring/XWayland/
 # toolkit-specific scale
-# env = GDK_SCALE,2 
+#env = GDK_SCALE,1.25 
 
 # firefox
 env = MOZ_ENABLE_WAYLAND,1
@@ -27,6 +30,7 @@ env = ELECTRON_OZONE_PLATFORM_HINT,auto
 
 # NVIDIA 
 # This is from Hyprland Wiki. Below will be activated nvidia gpu detected
+# See hyprland wiki https://wiki.hyprland.org/Nvidia/#environment-variables
 #env = LIBVA_DRIVER_NAME,nvidia 
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 #env = NVD_BACKEND,direct 
diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index 1a1226a9..b4dca898 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -51,5 +51,5 @@ device {
 #bindl = , switch:on:Lid Switch,exec,echo "monitor = eDP-1, disable" > $UserConfigs/LaptopDisplay.conf
 
 # for laptop-lid action (to erase the last entry)
-#exec-once = echo "eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
+#exec-once = echo "monitor = eDP-1, preferred, auto, 1" > $HOME/.config/hypr/UserConfigs/LaptopDisplay.conf
 #
diff --git a/config/hypr/UserConfigs/UserDecorAnimations.conf b/config/hypr/UserConfigs/UserDecorAnimations.conf
new file mode 100644
index 00000000..2885971a
--- /dev/null
+++ b/config/hypr/UserConfigs/UserDecorAnimations.conf
@@ -0,0 +1,62 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Decoration and Animations Settings
+
+# Hyprland Wiki Links
+# Animation - https://wiki.hyprland.org/Configuring/Animations/
+# Decoration - https://wiki.hyprland.org/Configuring/Variables/#decoration
+
+# Sourcing colors generated by wallust
+source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
+
+decoration {
+  rounding = 10
+         
+  active_opacity = 1.0
+  inactive_opacity = 0.9
+  fullscreen_opacity = 1.0
+
+  dim_inactive = true
+  dim_strength = 0.1
+  dim_special = 0.8
+
+  drop_shadow = true
+  shadow_range = 6
+  shadow_render_power = 1
+  col.shadow = $color12
+  col.shadow_inactive = 0x50000000
+
+  blur {
+  	enabled = true	
+  	size = 6
+  	passes = 2
+  	ignore_opacity = true
+  	new_optimizations = true
+  	special = true
+  }
+}
+
+    
+animations {
+  enabled = yes
+
+  bezier = wind, 0.05, 0.9, 0.1, 1.05
+  bezier = winIn, 0.1, 1.1, 0.1, 1.1
+  bezier = winOut, 0.3, -0.3, 0, 1
+  bezier = liner, 1, 1, 1, 1
+  bezier = overshot, 0.05, 0.9, 0.1, 1.05
+  bezier = smoothOut, 0.5, 0, 0.99, 0.99
+  bezier = smoothIn, 0.5, -0.5, 0.68, 1.5
+  
+  animation = windows, 1, 6, wind, slide
+  animation = windowsIn, 1, 5, winIn, slide
+  animation = windowsOut, 1, 3, smoothOut, slide
+  animation = windowsMove, 1, 5, wind, slide
+  animation = border, 1, 1, liner
+  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
+  animation = fade, 1, 3, smoothOut
+  animation = workspaces, 1, 5, overshot
+  
+  # animations for -git or version >0.42.0
+  #animation = workspacesIn, 1, 5, winIn, slide
+  #animation = workspacesOut, 1, 5, winOut, slide
+}
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 35dada78..7d3645bc 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -21,9 +21,7 @@ master {
 }
 
 general {
-  #sensitivity = 1.00
   border_size = 2
-  #apply_sens_to_raw = 1
   gaps_in = 6
   gaps_out = 8
 
@@ -31,54 +29,8 @@ general {
    
   col.active_border = $color12 
   col.inactive_border = $backgroundCol
-
-  layout = dwindle
-}
-
-decoration {
-  rounding = 10
-         
-  active_opacity = 1.0
-  inactive_opacity = 0.9
-  fullscreen_opacity = 1.0
-
-  dim_inactive = true
-  dim_strength = 0.1
-  dim_special = 0.8
-
-  drop_shadow = true
-  shadow_range = 6
-  shadow_render_power = 1
-  col.shadow = $color12
-  col.shadow_inactive = 0x50000000
-
-  blur {
-  	enabled = true	
-  	size = 6
-  	passes = 2
-  	ignore_opacity = true
-  	new_optimizations = true
-  	special = true
-  }
-}
-
-    
-animations {
-  enabled = yes
-
-  bezier = wind, 0.05, 0.9, 0.1, 1.05
-  bezier = winIn, 0.1, 1.1, 0.1, 1.1
-  bezier = winOut, 0.3, -0.3, 0, 1
-  bezier = liner, 1, 1, 1, 1
   
-  animation = windows, 1, 6, wind, slide
-  animation = windowsIn, 1, 6, winIn, slide
-  animation = windowsOut, 1, 5, winOut, slide
-  animation = windowsMove, 1, 5, wind, slide
-  animation = border, 1, 1, liner
-  animation = borderangle, 1, 180, liner, loop #used by rainbow borders and rotating colors
-  animation = fade, 1, 10, default
-  animation = workspaces, 1, 5, wind
+  layout = dwindle
 }
 
 input {
@@ -89,8 +41,9 @@ input {
   kb_rules =
   repeat_rate = 50
   repeat_delay = 300
+  
+  sensitivity = 0 #mouse sensitivity
   numlock_by_default = true
-  sensitivity = 0 #mouse sensivity
   left_handed = false
   follow_mouse = true
   float_switch_override_focus = false
@@ -140,7 +93,7 @@ group {
 misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
-	vfr = true
+  vfr = true
   #vrr = 0
   mouse_move_enables_dpms = true
   enable_swallow = true
@@ -151,6 +104,10 @@ misc {
   middle_click_paste = false
 }
 
+#opengl {
+#  nvidia_anti_flicker = true
+#}
+
 binds {
   workspace_back_and_forth = true
   allow_workspace_cycles = true
@@ -172,5 +129,6 @@ render {
 cursor {
   no_hardware_cursors = false
   enable_hyprcursor = true
-  warp_on_change_workspace = true 
+  warp_on_change_workspace = true
+  no_warps = true 
 }
diff --git a/config/hypr/UserConfigs/WindowRules.conf b/config/hypr/UserConfigs/WindowRules.conf
index 60d5007c..4019628a 100644
--- a/config/hypr/UserConfigs/WindowRules.conf
+++ b/config/hypr/UserConfigs/WindowRules.conf
@@ -55,7 +55,7 @@ windowrulev2 = float, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert
 windowrulev2 = float, class:^(nwg-look|qt5ct|qt6ct)$
 windowrulev2 = float, class:^(mpv|com.github.rafostar.Clapper)$
 windowrulev2 = float, class:^(nm-applet|nm-connection-editor|blueman-manager)$
-windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$ # system monitor
+windowrulev2 = float, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$ # system monitor
 windowrulev2 = float, class:^(yad)$ # icon browser
 windowrulev2 = float, class:^(wihotspot(-gui)?)$ # wifi hotspot
 windowrulev2 = float, class:^(evince)$ # document viewer
@@ -64,7 +64,7 @@ windowrulev2 = float, class:^([Bb]aobab|org.gnome.[Bb]aobab)$ # Disk usage analy
 windowrulev2 = float, title:(Kvantum Manager)
 windowrulev2 = float, class:^([Ss]team)$,title:^((?![Ss]team).*|[Ss]team [Ss]ettings)$
 windowrulev2 = float, class:^([Qq]alculate-gtk)$
-windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
+#windowrulev2 = float, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = float, class:^([Ff]erdium)$
 windowrulev2 = float, title:^(Picture-in-Picture)$
 windowrulev2 = float, title:^(ROG Control)$
@@ -74,6 +74,7 @@ windowrulev2 = float, title:^(ROG Control)$
 windowrulev2 = opacity 0.9 0.6, class:^([Rr]ofi)$
 windowrulev2 = opacity 0.9 0.7, class:^(Brave-browser(-beta|-dev)?)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
+windowrulev2 = opacity 0.9 0.7, class:^(zen-alpha)$ # zen browser
 windowrulev2 = opacity 0.9 0.6, class:^([Tt]horium-browser)$
 windowrulev2 = opacity 0.9 0.8, class:^([Mm]icrosoft-edge(-stable|-beta|-dev|-unstable)?)$
 windowrulev2 = opacity 0.9 0.8, class:^(google-chrome(-beta|-dev|-unstable)?)$
@@ -97,14 +98,14 @@ windowrulev2 = opacity 0.94 0.86, class:^(gnome-disks|evince|wihotspot(-gui)?|or
 windowrulev2 = opacity 0.9 0.8, class:^(file-roller|org.gnome.FileRoller)$ # archive manager
 windowrulev2 = opacity 0.8 0.7, class:^(app.drey.Warp)$ # Warp file transfer
 windowrulev2 = opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui
-windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
+windowrulev2 = opacity 0.82 0.75, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$
 windowrulev2 = opacity 0.9 0.8, class:^(xdg-desktop-portal-gtk)$ # gnome-keyring gui
 windowrulev2 = opacity 0.9 0.7, class:^([Ww]hatsapp-for-linux)$
 windowrulev2 = opacity 0.9 0.7, class:^([Ff]erdium)$
 windowrulev2 = opacity 0.95 0.75, title:^(Picture-in-Picture)$
 
 # windowrule v2 - size
-windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor)$
+windowrulev2 = size 70% 70%, class:^(gnome-system-monitor|org.gnome.SystemMonitor|io.missioncenter.MissionCenter)$
 windowrulev2 = size 70% 70%, class:^(xdg-desktop-portal-gtk)$
 windowrulev2 = size 60% 70%, title:(Kvantum Manager)
 windowrulev2 = size 60% 70%, class:^(qt6ct)$
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index 8864a30c..6320218b 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -16,9 +16,10 @@ menu(){
   printf "5. edit Monitors\n"
   printf "6. edit Laptop-Keybinds\n"
   printf "7. edit User-Settings\n"
-  printf "8. edit Workspace-Rules\n"
-  printf "9. edit Default-Settings\n"
-  printf "10. edit Default-Keybinds\n"
+  printf "8. edit Decorations & Animations\n"
+  printf "9. edit Workspace-Rules\n"
+  printf "10. edit Default-Settings\n"
+  printf "11. edit Default-Keybinds\n"
 }
 
 main() {
@@ -46,12 +47,15 @@ main() {
             $tty $editor "$UserConfigs/UserSettings.conf"
             ;;
         8)
-            $tty $editor "$UserConfigs/WorkspaceRules.conf"
+            $tty $editor "$UserConfigs/UserDecorAnimations.conf"
             ;;
-		9)
+        9)
+            $tty $editor "$UserConfigs/WorkspaceRules.conf"
+            ;;            
+		10)
             $tty $editor "$configs/Settings.conf"
             ;;
-        10)
+        11)
             $tty $editor "$configs/Keybinds.conf"
             ;;
         *)
diff --git a/config/hypr/UserScripts/RainbowBorders.sh b/config/hypr/UserScripts/RainbowBorders.sh
index 1f5e6cdb..49295680 100755
--- a/config/hypr/UserScripts/RainbowBorders.sh
+++ b/config/hypr/UserScripts/RainbowBorders.sh
@@ -5,6 +5,8 @@ function random_hex() {
     echo $random_hex
 }
 
+# rainbow colors only for active window
 hyprctl keyword general:col.active_border $(random_hex)  $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex)  270deg
 
-hyprctl keyword general:col.inactive_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex)  270deg
\ No newline at end of file
+# rainbow colors for inactive window (uncomment to take effect)
+#hyprctl keyword general:col.inactive_border $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) 270deg
\ No newline at end of file
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index aa9f62e8..26e12876 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -10,18 +10,19 @@ iDIR="$HOME/.config/swaync/icons"
 
 # Online Stations. Edit as required
 declare -A online_music=(
-  ["Lofi Girl Radio ☕️🎶"]="https://play.streamafrica.net/lofiradio"
+  ["Radio - Lofi Girl 🎧🎶"]="https://play.streamafrica.net/lofiradio"
+  ["Radio - Chillhop 🎧🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
   ["FM - Easy Rock 96.3 📻🎶"]="https://radio-stations-philippines.com/easy-rock"
+  ["FM - Love Radio 90.7 📻🎶"]="https://radio-stations-philippines.com/love"
   ["FM - WRock - CEBU 96.3 📻🎶"]="https://onlineradio.ph/126-96-3-wrock.html"
-  ["YT - Wish 107.5 YT Pinoy HipHop 🎻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
-  ["YT - Top Youtube Music 2023 ☕️🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
-  ["YT - Wish 107.5 YT Wishclusives ☕️🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
-  ["Chillhop Radio ☕️🎶"]="http://stream.zeno.fm/fyn8eh3h5f8uv"
-  ["FM - Fresh Philippines ☕️🎶"]="https://onlineradio.ph/553-fresh-fm.html"
-  ["YT - Relaxing Music ☕️🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
-  ["YT - Youtube Remix 📻🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0"
-  ["YT - Korean Drama OST 📻🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
-  ["YT - AfroBeatz 2024 🎧"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ"
+  ["FM - Fresh Philippines 📻🎶"]="https://onlineradio.ph/553-fresh-fm.html"
+  ["YT - Wish 107.5 YT Pinoy HipHop 📻🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJnmgMYwCKid4XIFqUKBVWEs&si=vahW_noh4UDJ5d37"
+  ["YT - Top Youtube Music 2023 📹🎶"]="https://youtube.com/playlist?list=PLDIoUOhQQPlXr63I_vwF9GD8sAKh77dWU&si=y7qNeEVFNgA-XxKy"
+  ["YT - Wish 107.5 YT Wishclusives 📹🎶"]="https://youtube.com/playlist?list=PLkrzfEDjeYJn5B22H9HOWP3Kxxs-DkPSM&si=d_Ld2OKhGvpH48WO"
+  ["YT - Relaxing Music 📹🎶"]="https://youtube.com/playlist?list=PLMIbmfP_9vb8BCxRoraJpoo4q1yMFg4CE"
+  ["YT - Youtube Remix 📹🎶"]="https://youtube.com/playlist?list=PLeqTkIUlrZXlSNn3tcXAa-zbo95j0iN-0"
+  ["YT - Korean Drama OST 📹🎶"]="https://youtube.com/playlist?list=PLUge_o9AIFp4HuA-A3e3ZqENh63LuRRlQ"
+  ["YT - AfroBeatz 2024 📹"]="https://www.youtube.com/watch?v=7uB-Eh9XVZQ"
 )
 
 # Populate local_music array with files from music directory and subdirectories
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 65da9ff5..9bd89647 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -54,11 +54,11 @@ bind = $mainMod CTRL, Return, layoutmsg, swapwithmaster
 
 # group
 bind = $mainMod, G, togglegroup
-bind = $mainMod SHIFT, tab, changegroupactive  #change focus to another window
+bind = $mainMod CTRL, tab, changegroupactive  #change focus to another window
 
  # Cycle windows if floating bring to top
-bind = ALT,Tab,cyclenext
-bind = ALT,Tab,bringactivetotop  
+bind = ALT, tab, cyclenext
+bind = ALT, tab, bringactivetotop  
 
 # Special Keys / Hot Keys
 bindel = , xf86audioraisevolume, exec, $scriptsDir/Volume.sh --inc #volume up
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index a8ae26f4..15a0b26d 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -15,6 +15,7 @@ source= $UserConfigs/Monitors.conf
 source= $UserConfigs/Laptops.conf
 source= $UserConfigs/LaptopDisplay.conf
 source= $UserConfigs/WindowRules.conf
+source= $UserConfigs/UserDecorAnimations.conf
 source= $UserConfigs/UserKeybinds.conf
 source= $UserConfigs/UserSettings.conf
 source= $UserConfigs/WorkspaceRules.conf
\ No newline at end of file
diff --git a/config/hypr/initial-boot.sh b/config/hypr/initial-boot.sh
index 85e65322..477f94eb 100755
--- a/config/hypr/initial-boot.sh
+++ b/config/hypr/initial-boot.sh
@@ -8,7 +8,7 @@
 # Variables
 scriptsDir=$HOME/.config/hypr/scripts
 wallpaper=$HOME/.config/hypr/wallpaper_effects/.wallpaper_modified
-waybar_style="$HOME/.config/waybar/style/[Dark] Half-Moon.css"
+waybar_style="$HOME/.config/waybar/style/[Colored] Chroma Glow.css"
 kvantum_theme="Catppuccin-Mocha"
 color_scheme="prefer-dark"
 gtk_theme="Andromeda-dark"
diff --git a/config/hypr/scripts/GameMode.sh b/config/hypr/scripts/GameMode.sh
index f8dc3505..4bb7e910 100755
--- a/config/hypr/scripts/GameMode.sh
+++ b/config/hypr/scripts/GameMode.sh
@@ -11,11 +11,13 @@ if [ "$HYPRGAMEMODE" = 1 ] ; then
     hyprctl --batch "\
         keyword animations:enabled 0;\
         keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:passes 0;\
+		keyword decoration:blur:passes 0;\
         keyword general:gaps_in 0;\
         keyword general:gaps_out 0;\
         keyword general:border_size 1;\
         keyword decoration:rounding 0"
+	
+	hyprctl keyword "windowrule opacity 1 override 1 override 1 override, ^(.*)$"
     swww kill 
     notify-send -e -u low -i "$notif" "gamemode enabled. All animations off"
     exit
diff --git a/config/hypr/scripts/ScreenShot.sh b/config/hypr/scripts/ScreenShot.sh
index 5d15ee68..d8c4b604 100755
--- a/config/hypr/scripts/ScreenShot.sh
+++ b/config/hypr/scripts/ScreenShot.sh
@@ -83,7 +83,6 @@ shotarea() {
 		wl-copy <"$tmpfile"
 		mv "$tmpfile" "$dir/$file"
 	fi
-	rm "$tmpfile"
 	notify_view
 }
 
diff --git a/config/hypr/v2.3.3 b/config/hypr/v2.3.4
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.3
+++ b/config/hypr/v2.3.4
diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current
index 11ad0407..10978a0f 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_current
+++ b/config/hypr/wallpaper_effects/.wallpaper_current
diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified
index ca86d18f..e97dd571 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_modified
+++ b/config/hypr/wallpaper_effects/.wallpaper_modified
diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf
index 4c6408bc..6bdaa4cc 100644
--- a/config/hypr/wallust/wallust-hyprland.conf
+++ b/config/hypr/wallust/wallust-hyprland.conf
@@ -1,18 +1,18 @@
-$background = rgb(050507)
-$foreground = rgb(EAF2FA)
-$color0 = rgb(050507)
-$color1 = rgb(824616)
-$color2 = rgb(7F481E)
-$color3 = rgb(6A5C56)
-$color4 = rgb(5D6879)
-$color5 = rgb(586D87)
-$color6 = rgb(92A4B4)
-$color7 = rgb(D8E4EF)
-$color8 = rgb(97A0A7)
-$color9 = rgb(AD5D1E)
-$color10 = rgb(A96027)
-$color11 = rgb(8D7A72)
-$color12 = rgb(7C8BA1)
-$color13 = rgb(7591B4)
-$color14 = rgb(C2DAF0)
-$color15 = rgb(D8E4EF)
+$background = rgb(0A0000)
+$foreground = rgb(FDEBE2)
+$color0 = rgb(0A0000)
+$color1 = rgb(654A37)
+$color2 = rgb(7B5D49)
+$color3 = rgb(906F5C)
+$color4 = rgb(A6826F)
+$color5 = rgb(BC9582)
+$color6 = rgb(BB9582)
+$color7 = rgb(F4DACE)
+$color8 = rgb(AB9990)
+$color9 = rgb(876349)
+$color10 = rgb(A37C62)
+$color11 = rgb(C0947B)
+$color12 = rgb(DDAD94)
+$color13 = rgb(FAC6AD)
+$color14 = rgb(FAC6AD)
+$color15 = rgb(F4DACE)