From 7f21fb3ee3fc162fd1f15698207e9538e847679a Mon Sep 17 00:00:00 2001
From: Janis Hutz <info@janishutz.com>
Date: Fri, 25 Apr 2025 16:16:14 +0200
Subject: [PATCH] [Build] Do full build

---
 build/render.js                       |   6 ++
 build/util.js                         |  21 +++-
 config/astal/util/colours.scss        |   8 +-
 config/hypr/hyprland/colors.conf      |   8 +-
 config/hypr/hyprland/general.conf     |  10 +-
 config/hypr/hyprland/windowrules.conf |  12 +--
 config/hypr/hyprland_desktop.conf     |   2 +-
 config/hypr/hyprland_laptop.conf      |   2 +-
 config/hypr/hyprlock.conf             |   4 +-
 config/wlogout/style.css              |   6 +-
 config/yazi/theme.toml                |   2 +-
 gtk-theme/dist/colours.css            | 144 +++++++++++++-------------
 renderable/hypr/hyprland/colors.conf  |   8 +-
 renderable/hypr/hyprlock.conf         |   2 +-
 renderable/wlogout/style.css          |   2 +-
 renderable/yazi/theme.toml            |   2 +-
 setup                                 |  13 ++-
 17 files changed, 141 insertions(+), 111 deletions(-)

diff --git a/build/render.js b/build/render.js
index 44a5cec..4129d5b 100644
--- a/build/render.js
+++ b/build/render.js
@@ -52,6 +52,7 @@ const build = ( wallpaper, lockpaper, theme ) => {
             'colour-accent-rgba-015': renderColourAsRGBA( palette[ 0 ], 0.15 ),
             'colour-accent-rgba-011': renderColourAsRGBA( palette[ 0 ], 0.11 ),
             'colour-accent-rgba-007': renderColourAsRGBA( palette[ 0 ], 0.07 ),
+            'colour-accent-hyprland': util.renderColourAsRGBAHex( palette[ 0 ], 0.8 ),
             // ───────────────────────────────────────────────────────────────────
             'colour-accent-gradient-1-hex': renderColourAsHex( util.getGradientColour( palette[ 0 ], 1, gradientMultipliers[ theme ] ) ),
             'colour-accent-gradient-2-hex': renderColourAsHex( util.getGradientColour( palette[ 0 ], 2, gradientMultipliers[ theme ] ) ),
@@ -65,15 +66,18 @@ const build = ( wallpaper, lockpaper, theme ) => {
             // ── Secondary accent ─────────────────────────────────────────────
             'colour-accent-2-hex': renderColourAsHex( palette[ 1 ] ),
             'colour-accent-2-rgb': renderColourAsRGB( palette[ 1 ] ),
+            'colour-accent-2-rgba-07': renderColourAsRGBA( palette[ 1 ], 0.7 ),
             'colour-accent-2-rgba-05': renderColourAsRGBA( palette[ 1 ], 0.5 ),
             'colour-accent-2-rgba-03': renderColourAsRGBA( palette[ 1 ], 0.3 ),
             'colour-accent-2-rgba-02': renderColourAsRGBA( palette[ 1 ], 0.2 ),
             'colour-accent-2-rgba-015': renderColourAsRGBA( palette[ 1 ], 0.15 ),
             'colour-accent-2-rgba-01': renderColourAsRGBA( palette[ 1 ], 0.1 ),
+            'colour-accent-2-hyprland': util.renderColourAsRGBAHex( palette[ 1 ], 0.8 ),
 
             // ── Tertiary accent ──────────────────────────────────────────────
             'colour-accent-3-hex': renderColourAsHex( palette[ 2 ] ),
             'colour-accent-3-rgb': renderColourAsRGB( palette[ 2 ] ),
+            'colour-accent-3-hyprland': util.renderColourAsRGBAHex( palette[ 2 ], 0.8 ),
 
             // ── Background ───────────────────────────────────────────────────
             'colour-background-hex': renderColourAsHex( colours.background[ theme ] ),
@@ -107,6 +111,7 @@ const build = ( wallpaper, lockpaper, theme ) => {
             // ── Shadow ───────────────────────────────────────────────────────
             'colour-shadow-hex': renderColourAsHex( colours.shadow[ theme ] ),
             'colour-shadow-rgb': renderColourAsRGB( colours.shadow[ theme ] ),
+            'colour-shadow-hyprland': util.renderColourAsRGBHex( colours.shadow[ theme ] ),
             'colour-shadow-rgba-07': renderColourAsRGBA( colours.shadow[ theme ], 0.7 ),
             'colour-shadow-rgba-05': renderColourAsRGBA( colours.shadow[ theme ], 0.5 ),
             'colour-shadow-rgba-03': renderColourAsRGBA( colours.shadow[ theme ], 0.3 ),
@@ -125,6 +130,7 @@ const build = ( wallpaper, lockpaper, theme ) => {
             // ───────────────────────────────────────────────────────────────────
             'colour-inactive-background-hex': renderColourAsHex( colours[ 'inactive-background' ][ theme ] ),
             'colour-inactive-background-rgb': renderColourAsRGB( colours[ 'inactive-background' ][ theme ] ),
+            'colour-inactive-background-hyprland': util.renderColourAsRGBHex( colours[ 'inactive-background' ][ theme ] ),
             'colour-inactive-background-rgba-07': renderColourAsRGBA( colours[ 'inactive-background' ][ theme ], 0.7 ),
             'colour-inactive-background-rgba-05': renderColourAsRGBA( colours[ 'inactive-background' ][ theme ], 0.5 ),
             'colour-inactive-background-rgba-04': renderColourAsRGBA( colours[ 'inactive-background' ][ theme ], 0.4 ),
diff --git a/build/util.js b/build/util.js
index bf562e8..c2ee602 100644
--- a/build/util.js
+++ b/build/util.js
@@ -35,11 +35,26 @@ const renderColourAsHex = ( colour ) => {
 }
 
 const renderColourAsRGB = ( colour ) => {
-    return `rgb( ${ colour[ 0 ] }, ${ colour[ 1 ] }, ${ colour[ 2 ] } )`
+    return `rgb(${ colour[ 0 ] }, ${ colour[ 1 ] }, ${ colour[ 2 ] })`
 }
 
 const renderColourAsRGBA = ( colour, ambiance ) => {
-    return `rgba( ${ colour[ 0 ] }, ${ colour[ 1 ] }, ${ colour[ 2 ] }, ${ ambiance } )`
+    return `rgba(${ colour[ 0 ] }, ${ colour[ 1 ] }, ${ colour[ 2 ] }, ${ ambiance })`
+}
+
+const renderColourAsRGBHex = ( colour ) => {
+    const hexCol = convert.default.rgb.hex( colour[ 0 ], colour[ 1 ], colour[ 2 ] );
+    return `rgb(${hexCol})`.toLowerCase();
+}
+
+function decimalToHex(decimal) {
+  const hexValue = Math.round(decimal * 255);
+  return hexValue.toString(16).padStart(2, '0');
+}
+
+const renderColourAsRGBAHex = ( colour, ambiance ) => {
+    const hexCol = convert.default.rgb.hex( colour[ 0 ], colour[ 1 ], colour[ 2 ] );
+    return `rgba(${hexCol}${decimalToHex(ambiance)})`.toLowerCase();
 }
 
 
@@ -131,6 +146,8 @@ module.exports = {
     renderColourAsHex,
     renderColourAsRGB,
     renderColourAsRGBA,
+    renderColourAsRGBHex,
+    renderColourAsRGBAHex,
     themePreProcessor,
     getGradientColour
 }
diff --git a/config/astal/util/colours.scss b/config/astal/util/colours.scss
index d16d574..4b51248 100644
--- a/config/astal/util/colours.scss
+++ b/config/astal/util/colours.scss
@@ -1,4 +1,4 @@
-$fg-color: #C8DCFF;
-$bg-color: #0A0A0F;
-$accent-color: #0B0B0B;
-$accent-color-2: #F0F4F5;
+$fg-color: #E6E6E6;
+$bg-color: #141414;
+$accent-color: #154881;
+$accent-color-2: #ABADCD;
diff --git a/config/hypr/hyprland/colors.conf b/config/hypr/hyprland/colors.conf
index 70ebec2..5a1a4fd 100644
--- a/config/hypr/hyprland/colors.conf
+++ b/config/hypr/hyprland/colors.conf
@@ -4,13 +4,15 @@
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
 
+exec = swaybg -m fill -i /home/janis/NextCloud/Wallpapers/arch-matterhorn.jpg
+
 general {
-    col.active_border = rgb( 11, 11, 11 ) rgb( 240, 244, 245 ) rgb( 82, 89, 93 ) 45deg
-    col.inactive_border = rgb( 200, 200, 200 )
+    col.active_border = rgba(154881cc) rgba(abadcdcc) rgba(627dabcc) 45deg
+    col.inactive_border = rgb(000000)
 }
 
 decoration {
     shadow {
-        color = 
+        color = rgb(282828)
     }
 }
diff --git a/config/hypr/hyprland/general.conf b/config/hypr/hyprland/general.conf
index af6b1fb..5584f28 100644
--- a/config/hypr/hyprland/general.conf
+++ b/config/hypr/hyprland/general.conf
@@ -11,7 +11,7 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 # exec-once = waybar
-exec-once = ags run ~/projects/active/dotfiles/config/astal --gtk4
+exec-once = /bin/bash -c "ags run ~/projects/active/dotfiles/config/astal --gtk4"
 exec-once = hypridle
 
 exec-once = nm-applet
@@ -64,10 +64,10 @@ general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
     gaps_in = 3
-    gaps_out = 10
+    gaps_out = 4
     border_size = 1
-    col.active_border = rgba(cc5c00ff) rgba(cc5c00ff) rgba(ff0000ff) 45deg
-    col.inactive_border = rgba(595959aa)
+    # col.active_border = rgba(cc5c00ff) rgba(cc5c00ff) rgba(ff0000ff) 45deg
+    # col.inactive_border = rgba(595959aa)
 
     layout = master
     no_border_on_floating = false
@@ -81,7 +81,7 @@ decoration {
     shadow {
         enabled = true
         range = 4
-        color = rgba(1a1a1aee)
+        # color = rgba(1a1a1aee)
     }
 
     blur {
diff --git a/config/hypr/hyprland/windowrules.conf b/config/hypr/hyprland/windowrules.conf
index ce6ac9a..4537351 100644
--- a/config/hypr/hyprland/windowrules.conf
+++ b/config/hypr/hyprland/windowrules.conf
@@ -5,12 +5,12 @@
 # ────────────────────────────────────────────────────────────────────
 
 # Display full sized (without gaps), if only window on screen
-workspace = w[tv1], gapsout:0, gapsin:0
-workspace = f[1], gapsout:0, gapsin:0
-windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
-windowrule = rounding 0, floating:0, onworkspace:w[tv1]
-windowrule = bordersize 0, floating:0, onworkspace:f[1]
-windowrule = rounding 0, floating:0, onworkspace:f[1]
+# workspace = w[tv1], gapsout:0, gapsin:0
+# workspace = f[1], gapsout:0, gapsin:0
+# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
+# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
+# windowrule = bordersize 0, floating:0, onworkspace:f[1]
+# windowrule = rounding 0, floating:0, onworkspace:f[1]
 
 $mainMod = SUPER
 
diff --git a/config/hypr/hyprland_desktop.conf b/config/hypr/hyprland_desktop.conf
index 4ed1350..b5b4114 100644
--- a/config/hypr/hyprland_desktop.conf
+++ b/config/hypr/hyprland_desktop.conf
@@ -24,7 +24,7 @@ monitor=DP-2, 1920x1080@75, 1920x0, 1
 
 
 # exec = swaybg -m fill -i /mnt/storage/SORTED/Pictures/Wallpapers/wallpaper/arch-bg-matterhorn.jpg
-exec = swaybg -m fill -i /mnt/storage/SORTED/Pictures/Wallpapers/McLaren/main_livery_upscaled.jpg
+# exec = swaybg -m fill -i /mnt/storage/SORTED/Pictures/Wallpapers/McLaren/main_livery_upscaled.jpg
 
 
 source=./hyprland/binds.conf
diff --git a/config/hypr/hyprland_laptop.conf b/config/hypr/hyprland_laptop.conf
index f8bd47e..f07b3b6 100644
--- a/config/hypr/hyprland_laptop.conf
+++ b/config/hypr/hyprland_laptop.conf
@@ -22,7 +22,7 @@ monitor=eDP-1, 2880x1800@60, 0x0, 1.5
 # monitor=,highres highrr, auto, 1
 
 
-exec = swaybg -m fill -i /home/janis/Pictures/arch-bg.png
+# exec = swaybg -m fill -i /home/janis/Pictures/arch-bg.png
 
 
 source=./hyprland/binds.conf
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 58c4aab..64b5495 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -18,7 +18,7 @@ general {
 # └                                                ┘
 background {
     monitor = 
-    path = &#x2F;home&#x2F;janis&#x2F;NextCloud&#x2F;Wallpapers&#x2F;arch&#x2F;arch-simple.jpg # Or screenshot
+    path = /home/janis/NextCloud/Wallpapers/arch-matterhorn.jpg # Or screenshot
 
     blur_passes = 1
 }
@@ -33,7 +33,7 @@ input-field {
     dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = false
-    outer_color = rgb( 11, 11, 11 )
+    outer_color = rgb(21, 72, 129)
     inner_color = rgb(200, 200, 200)
     font_color = rgb(10, 10, 10)
     fade_on_empty = true
diff --git a/config/wlogout/style.css b/config/wlogout/style.css
index 354bc2e..e3b37b7 100644
--- a/config/wlogout/style.css
+++ b/config/wlogout/style.css
@@ -7,7 +7,7 @@ window {
     font-family: monospace;
     font-size: 14pt;
     color: #ffffff; /* text */
-    background-color: rgba( 10, 10, 15, 0.5 );
+    background-color: rgba(20, 20, 20, 0.5);
 }
 
 button {
@@ -25,8 +25,8 @@ button:hover {
 }
 
 button:focus {
-    background-color: rgb( 11, 11, 11 );
-    color: ;
+    background-color: rgb(21, 72, 129);
+    color: rgb(230, 230, 230);
 }
 
 #lock {
diff --git a/config/yazi/theme.toml b/config/yazi/theme.toml
index a32bb0c..adcc78f 100644
--- a/config/yazi/theme.toml
+++ b/config/yazi/theme.toml
@@ -1,2 +1,2 @@
 [flavor]
-use = tokyo-night
+use = "vscode-dark-modern"
diff --git a/gtk-theme/dist/colours.css b/gtk-theme/dist/colours.css
index a8c4dda..c85ded7 100644
--- a/gtk-theme/dist/colours.css
+++ b/gtk-theme/dist/colours.css
@@ -19,71 +19,71 @@
 /*
  * ── Foreground color, main interface text colour ─────────────────────
 */
-@define-color fg #C8DCFF;
-@define-color fg_rgba_07 rgba( 200, 220, 255, 0.7 );
-@define-color fg_rgba_06 rgba( 200, 220, 255, 0.6 );
-@define-color fg_rgba_05 rgba( 200, 220, 255, 0.5 );
-@define-color fg_rgba_03 rgba( 200, 220, 255, 0.3 );
-@define-color fg_rgba_02 rgba( 200, 220, 255, 0.2 );
-@define-color fg_rgba_01 rgba( 200, 220, 255, 0.1 );
+@define-color fg #E6E6E6;
+@define-color fg_rgba_07 rgba(230, 230, 230, 0.7);
+@define-color fg_rgba_06 rgba(230, 230, 230, 0.6);
+@define-color fg_rgba_05 rgba(230, 230, 230, 0.5);
+@define-color fg_rgba_03 rgba(230, 230, 230, 0.3);
+@define-color fg_rgba_02 rgba(230, 230, 230, 0.2);
+@define-color fg_rgba_01 rgba(230, 230, 230, 0.1);
 
 /*
  * ── Foreground accent, usually brighter or darker than default ───────
 */
 @define-color fg_accent #FFFFFF;
-@define-color fg_accent_rgba_07 rgba( 255, 255, 255, 0.7 );
-@define-color fg_accent_rgba_06 rgba( 255, 255, 255, 0.6 );
-@define-color fg_accent_rgba_05 rgba( 255, 255, 255, 0.5 );
-@define-color fg_accent_rgba_03 rgba( 255, 255, 255, 0.3 );
-@define-color fg_accent_rgba_02 rgba( 255, 255, 255, 0.2 );
+@define-color fg_accent_rgba_07 rgba(255, 255, 255, 0.7);
+@define-color fg_accent_rgba_06 rgba(255, 255, 255, 0.6);
+@define-color fg_accent_rgba_05 rgba(255, 255, 255, 0.5);
+@define-color fg_accent_rgba_03 rgba(255, 255, 255, 0.3);
+@define-color fg_accent_rgba_02 rgba(255, 255, 255, 0.2);
 
 /*
  * ── Accent colour ────────────────────────────────────────────────────
 */
-@define-color accent #0B0B0B;
-@define-color accent_rgba_05 rgba( 11, 11, 11, 0.5 );
-@define-color accent_rgba_03 rgba( 11, 11, 11, 0.3 );
-@define-color accent_rgba_02 rgba( 11, 11, 11, 0.2 );
-@define-color accent_rgba_015 rgba( 11, 11, 11, 0.15 );
-@define-color accent_rgba_011 rgba( 11, 11, 11, 0.11 );
-@define-color accent_rgba_007 rgba( 11, 11, 11, 0.07 );
+@define-color accent #154881;
+@define-color accent_rgba_05 rgba(21, 72, 129, 0.5);
+@define-color accent_rgba_03 rgba(21, 72, 129, 0.3);
+@define-color accent_rgba_02 rgba(21, 72, 129, 0.2);
+@define-color accent_rgba_015 rgba(21, 72, 129, 0.15);
+@define-color accent_rgba_011 rgba(21, 72, 129, 0.11);
+@define-color accent_rgba_007 rgba(21, 72, 129, 0.07);
 
 /*
  * ── Accent Gradient ──────────────────────────────────────────────────
 */
-@define-color accent_gradient_1 #090909;
-@define-color accent_gradient_2 #080808;
-@define-color accent_gradient_3 #070707;
-@define-color accent_gradient_4 #060606;
-@define-color accent_gradient_5 #060606;
-@define-color accent_gradient_inverse_1 #0E0E0E;
-@define-color accent_gradient_inverse_2 #0E0E0E;
-@define-color accent_gradient_inverse_3 #0E0E0E;
+@define-color accent_gradient_1 #0D2E53;
+@define-color accent_gradient_2 #0B2542;
+@define-color accent_gradient_3 #091D35;
+@define-color accent_gradient_4 #07182A;
+@define-color accent_gradient_5 #061322;
+@define-color accent_gradient_inverse_1 #2171CA;
+@define-color accent_gradient_inverse_2 #2171CA;
+@define-color accent_gradient_inverse_3 #2171CA;
 
 /*
  * ── Secondary accent colour ──────────────────────────────────────────
 */
-@define-color accent2 #F0F4F5;
-@define-color accent2_rgba_05 rgba( 240, 244, 245, 0.5 );
-@define-color accent2_rgba_03 rgba( 240, 244, 245, 0.3 );
-@define-color accent2_rgba_02 rgba( 240, 244, 245, 0.2 );
-@define-color accent2_rgba_015 rgba( 240, 244, 245, 0.15 );
-@define-color accent2_rgba_01 rgba( 240, 244, 245, 0.1 );
+@define-color accent2 #ABADCD;
+@define-color accent2_rgba_05 rgba(171, 173, 205, 0.5);
+@define-color accent2_rgba_03 rgba(171, 173, 205, 0.3);
+@define-color accent2_rgba_02 rgba(171, 173, 205, 0.2);
+@define-color accent2_rgba_015 rgba(171, 173, 205, 0.15);
+@define-color accent2_rgba_01 rgba(171, 173, 205, 0.1);
 
 /*
  * ── Tertiary accent colour ───────────────────────────────────────────
 */
-@define-color accent3 #52595D;
+@define-color accent3 #627DAB;
 
 /*
  * ── Inactive Colour ──────────────────────────────────────────────────
 */
 @define-color inactive #C8C8C8;
-@define-color inactive_rgba_07 rgba( 200, 200, 200, 0.7 );
-@define-color inactive_rgba_05 rgba( 200, 200, 200, 0.5 );
-@define-color inactive_rgba_03 rgba( 200, 200, 200, 0.3 );
-@define-color inactive_rgba_02 rgba( 200, 200, 200, 0.2 );
-@define-color inactive_rgba_015 rgba( 200, 200, 200, 0.15 );
+@define-color inactive_rgba_07 rgba(200, 200, 200, 0.7);
+@define-color inactive_rgba_05 rgba(200, 200, 200, 0.5);
+@define-color inactive_rgba_03 rgba(200, 200, 200, 0.3);
+@define-color inactive_rgba_02 rgba(200, 200, 200, 0.2);
+@define-color inactive_rgba_015 rgba(200, 200, 200, 0.15);
 
 
 
@@ -97,53 +97,53 @@
 /*
  * ── Background color, main interface background ──────────────────────
 */
-@define-color bg #0A0A0F;
-@define-color bg_rgba_07 rgba( 10, 10, 15, 0.7 );
-@define-color bg_rgba_05 rgba( 10, 10, 15, 0.5 );
-@define-color bg_rgba_03 rgba( 10, 10, 15, 0.3 );
-@define-color bg_rgba_02 rgba( 10, 10, 15, 0.2 );
-@define-color bg_rgba_015 rgba( 10, 10, 15, 0.15 );
-@define-color bg_rgba_011 rgba( 10, 10, 15, 0.11 );
+@define-color bg #141414;
+@define-color bg_rgba_07 rgba(20, 20, 20, 0.7);
+@define-color bg_rgba_05 rgba(20, 20, 20, 0.5);
+@define-color bg_rgba_03 rgba(20, 20, 20, 0.3);
+@define-color bg_rgba_02 rgba(20, 20, 20, 0.2);
+@define-color bg_rgba_015 rgba(20, 20, 20, 0.15);
+@define-color bg_rgba_011 rgba(20, 20, 20, 0.11);
 
 /*
  * ── Accent background color ──────────────────────────────────────────
 */
-@define-color bg_accent #141419;
-@define-color bg_accent_rgba_07 rgba( 20, 20, 25, 0.7 );
-@define-color bg_accent_rgba_06 rgba( 20, 20, 25, 0.6 );
-@define-color bg_accent_rgba_05 rgba( 20, 20, 25, 0.5 );
-@define-color bg_accent_rgba_04 rgba( 20, 20, 25, 0.4 );
-@define-color bg_accent_rgba_03 rgba( 20, 20, 25, 0.3 );
-@define-color bg_accent_rgba_02 rgba( 20, 20, 25, 0.2 );
-@define-color bg_accent_rgba_015 rgba( 20, 20, 25, 0.15 );
-@define-color bg_accent_rgba_01 rgba( 20, 20, 25, 0.1 );
+@define-color bg_accent #1E1E1E;
+@define-color bg_accent_rgba_07 rgba(30, 30, 30, 0.7);
+@define-color bg_accent_rgba_06 rgba(30, 30, 30, 0.6);
+@define-color bg_accent_rgba_05 rgba(30, 30, 30, 0.5);
+@define-color bg_accent_rgba_04 rgba(30, 30, 30, 0.4);
+@define-color bg_accent_rgba_03 rgba(30, 30, 30, 0.3);
+@define-color bg_accent_rgba_02 rgba(30, 30, 30, 0.2);
+@define-color bg_accent_rgba_015 rgba(30, 30, 30, 0.15);
+@define-color bg_accent_rgba_01 rgba(30, 30, 30, 0.1);
 
 /*
  * ── Tertiary background colour ───────────────────────────────────────
 */
-@define-color bg_tertiary #000000;
-@define-color bg_tertiary_rgba_05 rgba( 0, 0, 0, 0.5 );
-@define-color bg_tertiary_rgba_02 rgba( 0, 0, 0, 0.2 );
+@define-color bg_tertiary #2D2D2D;
+@define-color bg_tertiary_rgba_05 rgba(45, 45, 45, 0.5);
+@define-color bg_tertiary_rgba_02 rgba(45, 45, 45, 0.2);
 
 /*
  * ── Inactive background colour ───────────────────────────────────────
 */
 @define-color bg_inactive #000000;
-@define-color bg_inactive_rgba_07 rgba( 0, 0, 0, 0.7 );
-@define-color bg_inactive_rgba_05 rgba( 0, 0, 0, 0.5 );
-@define-color bg_inactive_rgba_04 rgba( 0, 0, 0, 0.4 );
-@define-color bg_inactive_rgba_03 rgba( 0, 0, 0, 0.3 );
-@define-color bg_inactive_rgba_02 rgba( 0, 0, 0, 0.2 );
-@define-color bg_inactive_rgba_015 rgba( 0, 0, 0, 0.15 );
-@define-color bg_inactive_rgba_01 rgba( 0, 0, 0, 0.1 );
+@define-color bg_inactive_rgba_07 rgba(0, 0, 0, 0.7);
+@define-color bg_inactive_rgba_05 rgba(0, 0, 0, 0.5);
+@define-color bg_inactive_rgba_04 rgba(0, 0, 0, 0.4);
+@define-color bg_inactive_rgba_03 rgba(0, 0, 0, 0.3);
+@define-color bg_inactive_rgba_02 rgba(0, 0, 0, 0.2);
+@define-color bg_inactive_rgba_015 rgba(0, 0, 0, 0.15);
+@define-color bg_inactive_rgba_01 rgba(0, 0, 0, 0.1);
 
 /*
  * ── Shadow colours ───────────────────────────────────────────────────
 */
-@define-color shadow #000002;
-@define-color shadow_rgba_07 rgba( 0, 0, 2, 0.7 );
-@define-color shadow_rgba_05 rgba( 0, 0, 2, 0.5 );
-@define-color shadow_rgba_03 rgba( 0, 0, 2, 0.3 );
-@define-color shadow_rgba_02 rgba( 0, 0, 2, 0.2 );
-@define-color shadow_rgba_015 rgba( 0, 0, 2, 0.15 );
-@define-color shadow_rgba_011 rgba( 0, 0, 2, 0.11 );
+@define-color shadow #282828;
+@define-color shadow_rgba_07 rgba(40, 40, 40, 0.7);
+@define-color shadow_rgba_05 rgba(40, 40, 40, 0.5);
+@define-color shadow_rgba_03 rgba(40, 40, 40, 0.3);
+@define-color shadow_rgba_02 rgba(40, 40, 40, 0.2);
+@define-color shadow_rgba_015 rgba(40, 40, 40, 0.15);
+@define-color shadow_rgba_011 rgba(40, 40, 40, 0.11);
diff --git a/renderable/hypr/hyprland/colors.conf b/renderable/hypr/hyprland/colors.conf
index bd5d568..65d8df4 100644
--- a/renderable/hypr/hyprland/colors.conf
+++ b/renderable/hypr/hyprland/colors.conf
@@ -4,13 +4,15 @@
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
 
+exec = swaybg -m fill -i {{{ wallpaper-path }}}
+
 general {
-    col.active_border = {{ colour-accent-rgb }} {{ colour-accent-2-rgb }} {{ colour-accent-3-rgb }} 45deg
-    col.inactive_border = {{ colour-inactive-rgb }}
+    col.active_border = {{ colour-accent-hyprland }} {{ colour-accent-2-hyprland }} {{ colour-accent-3-hyprland }} 45deg
+    col.inactive_border = {{ colour-inactive-background-hyprland }}
 }
 
 decoration {
     shadow {
-        color = {{ shadow_colour }}
+        color = {{ colour-shadow-hyprland }}
     }
 }
diff --git a/renderable/hypr/hyprlock.conf b/renderable/hypr/hyprlock.conf
index bd5fc9f..1f88b7f 100644
--- a/renderable/hypr/hyprlock.conf
+++ b/renderable/hypr/hyprlock.conf
@@ -18,7 +18,7 @@ general {
 # └                                                ┘
 background {
     monitor = 
-    path = {{ lockpaper-path }} # Or screenshot
+    path = {{{ lockpaper-path }}} # Or screenshot
 
     blur_passes = 1
 }
diff --git a/renderable/wlogout/style.css b/renderable/wlogout/style.css
index 0eb8a8c..0e05fe2 100644
--- a/renderable/wlogout/style.css
+++ b/renderable/wlogout/style.css
@@ -26,7 +26,7 @@ button:hover {
 
 button:focus {
     background-color: {{ colour-accent-rgb }};
-    color: {{ colour-primary-rgb }};
+    color: {{ colour-foreground-rgb }};
 }
 
 #lock {
diff --git a/renderable/yazi/theme.toml b/renderable/yazi/theme.toml
index 94b0b3f..0c67e15 100644
--- a/renderable/yazi/theme.toml
+++ b/renderable/yazi/theme.toml
@@ -1,2 +1,2 @@
 [flavor]
-use = {{ yazi-theme }}
+use = "{{ yazi-theme }}"
diff --git a/setup b/setup
index 1256b9f..91232dc 100755
--- a/setup
+++ b/setup
@@ -26,7 +26,9 @@ echo "
 
 # Read platform to install on (only if no platform file present in ~/.config/)
 platform=""
-if [ -f "~/.config/platform" ]; then
+if [[ -f ~/.config/platform ]]; then
+    echo "Config type already selected, skipping"
+else
     read -p "Choose the configs to install, Laptop or Desktop (l/D): " platform
     echo "$platform" > ~/.config/platform
 fi
@@ -44,14 +46,15 @@ fi
 echo "
     => Moving configs to correct destinations
 "
+killall swaybg
 cp -r ./config/fish ~/.config/
 cp -r ./config/hypr ~/.config/
 
 # Depending on platform, remove one or the other config and rename remaining one
-if [ $platform == "d" ]; then
+if [[ "$platform" == "d" ]]; then
     mv ~/.config/hypr/hyprland_desktop.conf ~/.config/hypr/hyprland.conf
     rm ~/.config/hypr/hyprland_*
-else then
+else
     mv ~/.config/hypr/hyprland_laptop.conf ~/.config/hypr/hyprland.conf
     rm ~/.config/hypr/hyprland_*
 fi
@@ -74,13 +77,13 @@ echo "
     => Installing GTK Theme
 "
 sudo rm -rf /usr/share/themes/Adaptive-Theme/
-sudo mkdir /usr/share/themes/
+sudo mkdir /usr/share/themes/Adaptive-Theme/
 sudo cp -r ./gtk-theme/dist/* /usr/share/themes/Adaptive-Theme/
 
 echo "
     => Installing System Configs
 "
-sudo echo "$(cat ./system/environment)" > /etc/environment
+sudo cp ./system/environment /etc/environment
 
 echo "