Merge branch 'upstream-main' into fcitx5

fix: fcitx5 conf
2024-06-05 05:50:50 -04:00 · 2024-04-05 16:13:19 -04:00 · 2024-04-05 16:07:36 -04:00 · 2024-04-05 15:50:00 -04:00 · 2024-04-05 15:31:21 -04:00 · 2024-04-05 02:59:46 -04:00
114 changed files with 2387 additions and 692 deletions
@@ -109,7 +109,7 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."'
 alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120'
 alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120'

-export PATH="/usr/lib/ccache/bin/:$PATH"
+export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"

 # -----------------------------------------------------
 # DEVELOPMENT
@@ -1,7 +0,0 @@
-# ------------------------------------------------------
-# Modify existing files before restore starts
-# ------------------------------------------------------
-
-if [ -d ~/dotfiles ] ;then
-    echo ":: Modify existing files"
-fi
@@ -19,7 +19,6 @@ if gum confirm "Do you want to run a short system check?" ;then
    _commandExists "wlogout" "wlogout"
    _commandExists "eww" "eww"
    _commandExists "magick" "imagemagick"
-    _commandExists "waypaper" "waypaper"

 elif [ $? -eq 130 ]; then
    exit 130
@@ -63,15 +63,10 @@ if [ -z "${dmsel}" ] ;then
 fi
 if [ "$dmsel" == "Install sddm and theme" ] ;then

-    if [ -d /usr/share/sddm/themes/sugar-candy/ ] ;then
-        sudo rm -rf /usr/share/sddm/themes/sugar-candy/
-        echo ":: Sugar Candy folder removed"
-    fi
-
    disman=0
    # Try to force the installation of sddm
    echo ":: Install sddm"
-    yay -S --noconfirm sddm sddm-sugar-candy-git --ask 4
+    yay -S --noconfirm sddm --ask 4

    # Enable sddm
    if [ -f /etc/systemd/system/display-manager.service ]; then
@@ -79,24 +74,41 @@ if [ "$dmsel" == "Install sddm and theme" ] ;then
    fi
    sudo systemctl enable sddm.service

+    # Create sddm.conf.d folder
    if [ ! -d /etc/sddm.conf.d/ ]; then
        sudo mkdir /etc/sddm.conf.d
-        echo "Folder /etc/sddm.conf.d created."
+        echo ":: Folder /etc/sddm.conf.d created."
    fi

+    # Copy sddm.conf
    sudo cp sddm/sddm.conf /etc/sddm.conf.d/
-    echo "File /etc/sddm.conf.d/sddm.conf updated."
+    echo ":: File /etc/sddm.conf.d/sddm.conf updated."

+    # Download and install sugar candy theme if not exists
+    if [ ! -d /usr/share/sddm/themes/sugar-candy ]; then
+        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
+            rm ~/Downloads/sddm-sugar-candy-master.zip
+        fi
+        wget -P ~/Downloads/ https://framagit.org/MarianArlt/sddm-sugar-candy/-/archive/master/sddm-sugar-candy-master.zip
+        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
+            unzip -o -q ~/Downloads/sddm-sugar-candy-master.zip -d ~/Downloads/
+            if [ ! -d /usr/share/sddm/themes/sugar-candy ] ;then
+                sudo mkdir -p /usr/share/sddm/themes/sugar-candy
+            fi
+            sudo cp -r ~/Downloads/sddm-sugar-candy-master/* /usr/share/sddm/themes/sugar-candy
+            echo ":: SDDM Sugar Candy Theme installed"
+        else
+            echo "ERROR: Sugar Candy Download not found"
+        fi
+    fi    
+
+    # Install background wallpaper for sddm
    if [ -f /usr/share/sddm/themes/sugar-candy/theme.conf ]; then
-
-        # Cache file for holding the current wallpaper
        sudo cp wallpapers/default.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
-        echo "Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
-
+        echo ":: Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
        sudo cp sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
        sudo sed -i 's/CURRENTWALLPAPER/'"current_wallpaper.jpg"'/' /usr/share/sddm/themes/sugar-candy/theme.conf
-        echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
-
+        echo ":: File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
    fi

 elif [ "$dmsel" == "Deactivate current display manager" ] ;then
@@ -0,0 +1,24 @@
+# ------------------------------------------------------
+# Select fcitx5 or not
+# ------------------------------------------------------
+echo -e "${GREEN}"
+figlet "fcitx5"
+echo -e "${NONE}"
+
+if gum confirm "Do you want to install fcitx5 and chinese input method?" ;then
+    packagesPacman=(
+        "fcitx5"
+        "fcitx5-chinese-addons"
+        "fcitx5-configtool"
+        "fcitx5-gtk"
+        "fcitx5-qt"
+    );
+    packagesYay=(
+        "fcitx5-skin-seasons"
+    );
+    source .install/install-packages.sh
+    echo -e "\n# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# fcitx5 support" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "source = ~/dotfiles/hypr/conf/fcitx5.conf" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+fi
@@ -37,14 +37,11 @@ fi
 if [ -d ~/dotfiles-versions/$version/swappy ]; then
    _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/eww ]; then
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
    _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
 fi
 if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
 fi
-if [ -d ~/dotfiles-versions/$version/waypaper ]; then
-    _installSymLink waypaper ~/.config/waypaper ~/dotfiles/waypaper/ ~/.config
-fi
 echo ":: Symbolic links created."
 echo
@@ -16,5 +16,4 @@ packagesYay=(
    "nwg-look"
    "eww"
    "hyprshade"
-    "waypaper"
 );
@@ -8,7 +8,7 @@ echo

 # Check for required packages
 echo "Checking that required packages for the installation are installed..."
-_installPackagesPacman "rsync" "gum" "figlet" "python" "git";
+_installPackagesPacman "rsync" "gum" "figlet" "python";

 # Double check rsync
 if ! command -v rsync &> /dev/null; then
@@ -8,7 +8,7 @@ input {
    kb_model =
    kb_options =
    numlock_by_default = true
-    mouse_refocus = false
+    mouse_refocus=false
    
    # For United States
    # kb_layout = us
@@ -24,11 +24,7 @@ input {
        # for laptop
        # natural_scroll = yes
        # middle_button_emulation = true
-        # clickfinger_behavior = false          
+        # clickfinger_behavior = 1          
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}
@@ -8,7 +8,7 @@ input {
    kb_model =
    kb_options =
    numlock_by_default = true
-    mouse_refocus = false
+    mouse_refocus=false
    
    # For United States
    # kb_layout = us
@@ -22,14 +22,9 @@ input {
        # natural_scroll = false

        # for laptop
-        natural_scroll = true
+        natural_scroll = yes
        middle_button_emulation = true
-        clickfinger_behavior = false
-        disable_while_typing = true
+        clickfinger_behavior = 1  
    }
    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
-
-gestures {
-    workspace_swipe = true
-}
@@ -1 +1,4 @@
-* { border-width: 3px; }
+* {
+    border-width:   2px;
+    border-radius:  15px;
+}
@@ -1,26 +0,0 @@
-{
-    "custom/quicklink1": {
-        "format": "",
-        "on-click": "~/dotfiles/.settings/browser.sh",
-        "tooltip-format": "Open browser"
-    }, 
-    /*
-    "custom/quicklink1": {
-        "format": "",
-        "on-click": "firefox",
-        "tooltip-format": "Open Firefox"
-    },
-    */ 
-    "custom/quicklink2": {
-        "format": "",
-        "on-click": "~/dotfiles/.settings/filemanager.sh",
-        "tooltip-format": "Open filemanager"
-    }, 
-    "group/quicklinks": {
-        "orientation": "horizontal",
-        "modules": [
-            "custom/quicklink1",
-            "custom/quicklink2"
-         ]
-    }
-}
@@ -1 +1 @@
-2.9.2
+2.9.1.1
@@ -1 +1 @@
-2920
+2911
@@ -1,24 +1,3 @@
-Version 2.9.2
-https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.2
--------------------------------------------------------
- Works with Hyprland 0.41.2
- Introducing waypaper as new wallpaper selector
- Wallpaper cache for generated wallpaper variants. Will speed up the change between wallpapers if cached files exists. https://gitlab.com/stephan-raabe/dotfiles/-/wikis/Home/Wallpapers#wallpaper-cache
- You can define custom quicklinks in waybar: https://gitlab.com/stephan-raabe/dotfiles/-/wikis/Home/Waybar#define-your-quicklinks
- New SVG icons in waybar for ML4W and ChatGPT
- Default waybar theme changed to ml4w-blur/white
- Alacritty: selected text will be copied to the primary clipboard
- General/standard Hyprland environment configuration moved to ml4w.conf (will be re-used in kvm.conf and nvidia.conf)
- The time format in hyprlock is now aligned with the waybar clock time format that is defined in the ML4W Settings App
-
-Version 2.9.1.2
-https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.2
--------------------------------------------------------
- Workspaces module in waybar updated to enable scroll to change the workspace https://gitlab.com/stephan-raabe/dotfiles/-/merge_requests/114
- More functions deactivated in Game Mode (SUPER+ALT+G)
- Keybindings rofi menu updated with keybinding description. Open with right mouse click on Apps waybar module
- Fixed bug of ML4W Hyprland Settings App with Hyprland 0.41.0
-
 Version 2.9.1.1
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
 --------------------------------------------------------
@@ -1,8 +1,8 @@
-# ML4W Dotfiles 2.9.2
+# ML4W Dotfiles 2.9.1.1

 An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.

-[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png "Screenshot")](![screenshots/screenshot2.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/5715487b0af68f36295f4e37b634f17a/screenshot-20240627-113621.png))
+[![Screenshot](screenshots/screenshot2.png "Screenshot")](screenshots/screenshot2.png)

 The ML4W Dotfiles are available as 

@@ -37,7 +37,11 @@ You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to s

 ## Screenshots

-[![Screenshot](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png "Screenshot")](![screenshots/screenshot1.png](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/uploads/b8dc6a841b6b04fe0b2d380377117a50/screenshot-20240627-113733.png))
+[![Screenshot](screenshots/screenshot1.png "Screenshot")](screenshots/screenshot1.png)
+
+[![Screenshot](screenshots/screenshot3.png "Screenshot")](screenshots/screenshot3.png)
+
+[![Screenshot](screenshots/screenshot4.png "Screenshot")](screenshots/screenshot5.png)

 ## Wallpaper repository

@@ -51,8 +55,6 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
- Yingjie Wang: https://gitlab.com/GaugeAndGravity
- Daniel Gerber: https://gitlab.com/dan.john.gerber
 - https://gitlab.com/muee

 and many more...
@@ -11,6 +11,3 @@ opacity = 0.7
 [window.padding]
 x = 15
 y = 15
-
-[selection]
-save_to_clipboard = true
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/animations/default.conf
+source = ~/dotfiles/hypr/conf/animations/animation-moving.conf
@@ -20,18 +20,15 @@ exec-once = hypridle
 # Load cliphist history
 exec-once = wl-paste --watch cliphist store

+# Initialize Wallpaper Engine
+exec-once = ~/dotfiles/hypr/scripts/init-wallpaper-engine.sh
+
 # Autostart ML4W App
 exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh

 # Start ewww daemon
 exec-once = ~/dotfiles/hypr/scripts/eww.sh

-# Initialize waypaper
-exec-once = waypaper --restore
-
-# Launch Waybar
-exec-once = ~/dotfiles/waybar/launch.sh
-
 # Start autostart cleanup
 exec-once = ~/dotfiles/hypr/scripts/cleanup.sh

@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/decorations/default.conf
+source = ~/dotfiles/hypr/conf/decorations/custom.conf
@@ -0,0 +1,25 @@
+# ----------------------------------------------------- 
+# General window decoration
+# name: "Default"
+# ----------------------------------------------------- 
+
+decoration {
+    rounding = 10
+    blur {
+        enabled = true
+        size = 10
+        passes = 3
+        new_optimizations = on
+        ignore_opacity = true
+        xray = false
+        blurls = waybar
+    }
+    active_opacity = 1.0
+    inactive_opacity = 0.8
+    fullscreen_opacity = 1.0
+
+    drop_shadow = true
+    shadow_range = 30
+    shadow_render_power = 3
+    col.shadow = 0x66000000
+}
@@ -2,4 +2,11 @@
 # Environment Variables
 # name: "Default"
 # ----------------------------------------------------- 
-# Set in ml4w.conf
+
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = QT_QPA_PLATFORM,wayland
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = MOZ_ENABLE_WAYLAND,1
+env = GDK_SCALE,1
@@ -2,5 +2,13 @@
 # Environment Variables
 # name: "KVM"
 # ----------------------------------------------------- 
+
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = QT_QPA_PLATFORM,wayland
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = MOZ_ENABLE_WAYLAND,1
+env = GDK_SCALE,1
 env = WLR_RENDERER_ALLOW_SOFTWARE, 1
 env = WLR_NO_HARDWARE_CURSORS, 1
@@ -0,0 +1,5 @@
+exec-once = fcitx5-remote -r
+exec-once = fcitx5 -d --replace
+exec-once = fcitx5-remote -r
+
+bind=$mainMod CTRL, E, exec, pkill fcitx5 -9;sleep 1;fcitx5 -d --replace; sleep 1;fcitx5-remote -r
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/keybindings/default.conf
+source = ~/dotfiles/hypr/conf/keybindings/custom.conf
@@ -0,0 +1,94 @@
+# ----------------------------------------------------- 
+# Key bindings
+# name: "Default"
+# ----------------------------------------------------- 
+
+# SUPER KEY
+$mainMod = SUPER
+
+# Applications
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
+bind = $mainMod, period, exec, emote
+
+# Windows
+bind = $mainMod, Q, killactive
+bind = $mainMod, F, fullscreen
+bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
+bind = $mainMod, T, togglefloating
+bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
+bind = $mainMod, J, togglesplit
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+bind = $mainMod SHIFT, right, resizeactive, 100 0
+bind = $mainMod SHIFT, left, resizeactive, -100 0
+bind = $mainMod SHIFT, up, resizeactive, 0 -100
+bind = $mainMod SHIFT, down, resizeactive, 0 100
+bind = $mainMod, G, togglegroup
+
+# Actions
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
+bind = $mainMod CTRL, Q, exec, wlogout
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
+bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
+bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+
+# Workspaces
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod CTRL, down, workspace, empty
+bind = $mainMod CTRL, left, workspace, e-1
+bind = $mainMod CTRL, right, workspace, e+1
+
+# Fn keys
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send -t 400 "Volume: $(pactl get-sink-volume @DEFAULT_SINK@ | awk '/front-left/ {print $5}')"
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bind = , XF86AudioPlay, exec, playerctl play-pause
+bind = , XF86AudioPause, exec, playerctl pause
+bind = , XF86AudioNext, exec, playerctl next
+bind = , XF86AudioPrev, exec, playerctl previous
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bind = , XF86Calculator, exec, qalculate-gtk
+bind = , XF86Lock, exec, hyprlock
+bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh
+
+# Passthrough SUPER KEY to Virtual Machine
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset
@@ -7,88 +7,90 @@
 $mainMod = SUPER

 # Applications
-bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh # Open the terminal
-bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh # Open the browser
-bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh # Open the filemanager
+bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
+bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh

 # Windows
-bind = $mainMod, Q, killactive # Kill active window
-bind = $mainMod, F, fullscreen # Set active window to fullscreen
-bind = $mainMod, T, togglefloating # Toggle active windows into floating mode
-bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh # Toggle all windows into floating mode
-bind = $mainMod, J, togglesplit # Toggle split
-bind = $mainMod, left, movefocus, l # Move focus left
-bind = $mainMod, right, movefocus, r # Move focus right
-bind = $mainMod, up, movefocus, u # Move focus up
-bind = $mainMod, down, movefocus, d # Move focus down
-bindm = $mainMod, mouse:272, movewindow # Move window with the mouse
-bindm = $mainMod, mouse:273, resizewindow # Resize window with the mouse
-bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
-bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
-bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
-bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
-bind = $mainMod, G, togglegroup # Toggle window group
+bind = $mainMod, Q, killactive
+bind = $mainMod, F, fullscreen
+bind = $mainMod, E, exec, ~/dotfiles/.settings/filemanager.sh
+bind = $mainMod, T, togglefloating
+bind = $mainMod SHIFT, T, exec, ~/dotfiles/hypr/scripts/toggleallfloat.sh
+bind = $mainMod, J, togglesplit
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+bind = $mainMod SHIFT, right, resizeactive, 100 0
+bind = $mainMod SHIFT, left, resizeactive, -100 0
+bind = $mainMod SHIFT, up, resizeactive, 0 -100
+bind = $mainMod SHIFT, down, resizeactive, 0 100
+bind = $mainMod, G, togglegroup

 # Actions
-bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh # Toggle animations
-bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh # Take a screenshot
-bind = $mainMod CTRL, Q, exec, wlogout # Start wlogout
-bind = $mainMod SHIFT, W, exec, waypaper --random # Change the wallpaper
-bind = $mainMod CTRL, W, exec, waypaper # Open wallpaper selector
-bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i # Open application launcher
-bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh # Show keybindings
-bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh # Reload waybar
-bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh # Toggle waybar
-bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh # Reload hyprland config
-bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh # Open clipboard manager
-bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh # Open waybar theme switcher
-bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
-bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh # Toggle screenshader
-bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh # Toggle game mode
+bind = $mainMod SHIFT, A, exec, ~/dotfiles/hypr/scripts/toggle-animations.sh
+bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
+bind = $mainMod CTRL, Q, exec, wlogout
+bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
+bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
+bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
+bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
+bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
+bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
+bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
+bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
+bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
+bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
+bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+bind = $mainMod CTRL, P, exec, hyprpicker -a
+bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
+bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh

 # Workspaces
-bind = $mainMod, 1, workspace, 1 # Open workspace 1
-bind = $mainMod, 2, workspace, 2 # Open workspace 2
-bind = $mainMod, 3, workspace, 3 # Open workspace 3
-bind = $mainMod, 4, workspace, 4 # Open workspace 4
-bind = $mainMod, 5, workspace, 5 # Open workspace 5
-bind = $mainMod, 6, workspace, 6 # Open workspace 6
-bind = $mainMod, 7, workspace, 7 # Open workspace 7
-bind = $mainMod, 8, workspace, 8 # Open workspace 8
-bind = $mainMod, 9, workspace, 9 # Open workspace 9
-bind = $mainMod, 0, workspace, 10 # Open workspace 10
-bind = $mainMod SHIFT, 1, movetoworkspace, 1 # Move active window to workspace 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2 # Move active window to workspace 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3 # Move active window to workspace 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4 # Move active window to workspace 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5 # Move active window to workspace 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6 # Move active window to workspace 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7 # Move active window to workspace 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8 # Move active window to workspace 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9 # Move active window to workspace 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Move active window to workspace 10
-bind = $mainMod, mouse_down, workspace, e+1 # Open next workspace
-bind = $mainMod, mouse_up, workspace, e-1 # Open previous workspace
-bind = $mainMod CTRL, down, workspace, empty # Open the next empty workspace
-
-# Passthrough SUPER KEY to Virtual Machine
-bind = $mainMod, P, submap, passthru # Passthrough SUPER key to virtual machine
-submap = passthru
-bind = SUPER, Escape, submap, reset # Get SUPER key back from virtual machine
-submap = reset
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+bind = $mainMod CTRL, down, workspace, empty

 # Fn keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10% # Increase brightness by 10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%- # Reduce brightness by 10%
-bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% # Increase volume by 5%
-bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% # Reduce volume by 5%
-bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # Toggle mute
-bind = , XF86AudioPlay, exec, playerctl play-pause # Audio play pause
-bind = , XF86AudioPause, exec, playerctl pause # Audio pause
-bind = , XF86AudioNext, exec, playerctl next # Audio next
-bind = , XF86AudioPrev, exec, playerctl previous # Audio previous
-bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle # Toggle microphone
-bind = , XF86Calculator, exec, qalculate-gtk # Open calculator
-bind = , XF86Lock, exec, hyprlock # Open screenlock
-bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage # Open ML4W Dotfiles Settings app
+bind = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
+bind = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
+bind = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bind = , XF86AudioPlay, exec, playerctl play-pause
+bind = , XF86AudioPause, exec, playerctl pause
+bind = , XF86AudioNext, exec, playerctl next
+bind = , XF86AudioPrev, exec, playerctl previous
+bind = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bind = , XF86Calculator, exec, qalculate-gtk
+bind = , XF86Lock, exec, hyprlock
+bind = , XF86Tools, exec, alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh

+# Passthrough SUPER KEY to Virtual Machine
+bind = $mainMod, P, submap, passthru
+submap = passthru
+bind = SUPER, Escape, submap, reset
+submap = reset
@@ -8,8 +8,7 @@ dwindle {
 }

 master {
-    # new_is_master = true
-    # new_status = master
+    new_is_master = true
 }

 gestures {
@@ -8,8 +8,7 @@ dwindle {
 }

 master {
-    # new_is_master = true
-    # new_status = master
+    new_is_master = true
 }

 gestures {
@@ -2,22 +2,10 @@
 # ML4W configurations
 # ----------------------------------------------------- 

-# Pavucontrol floating
-windowrulev2 = float,class:(.*org.pulseaudio.pavucontrol.*)
-windowrulev2 = size 700 600,class:(.*org.pulseaudio.pavucontrol.*)
-windowrulev2 = center,class:(.*org.pulseaudio.pavucontrol.*)
+windowrulev2 = float,class:(.*chat.openai.com.*)
+windowrulev2 = size 500 50%,class:(.*chat.openai.com.*)
+windowrulev2 = move 20 70,class:(.*chat.openai.com.*)

-# OpenAI ChatGPT floating
-windowrulev2 = float,title:(.*chat.openai.com.*)
-windowrulev2 = size 500 50%,title:(.*chat.openai.com.*)
-windowrulev2 = move 20 70,title:(.*chat.openai.com.*)
-
-# ML4W Welcome App floating
-windowrulev2 = float,class:(.*waypaper.*)
-windowrulev2 = size 800 700,class:(.*waypaper.*)
-windowrulev2 = center,class:(.*waypaper.*)
-
-# ML4W Welcome App floating
 windowrulev2 = float,class:(com.ml4w.welcome)
 windowrulev2 = size 700 600,class:(com.ml4w.welcome)
 windowrulev2 = center,class:(com.ml4w.welcome)
@@ -26,7 +14,6 @@ windowrulev2 = float,class:(ml4w-welcome.py)
 windowrulev2 = size 400 500,class:(ml4w-welcome.py)
 windowrulev2 = center,class:(ml4w-welcome.py)

-# ML4W Settings App floating
 windowrulev2 = float,class:(com.ml4w.dotfilessettings)
 windowrulev2 = size 700 600,class:(com.ml4w.dotfilessettings)
 windowrulev2 = move 10% 20%,class:(com.ml4w.dotfilessettings)
@@ -35,40 +22,19 @@ windowrulev2 = float,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = size 400 500,class:(ml4w-dotfiles-settings.py)
 windowrulev2 = move 10% 20%,class:(ml4w-dotfiles-settings.py)

-# ML4W Hyprland App floating
-windowrulev2 = float,class:(com.ml4w.hyprland.settings)
-windowrulev2 = size 700 600,class:(com.ml4w.hyprland.settings)
-windowrulev2 = center,class:(com.ml4w.hyprland.settings)
+windowrulev2 = float,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = size 700 600,class:(com.ml4w.hyprlandsettings)
+windowrulev2 = center,class:(com.ml4w.hyprlandsettings)

 windowrulev2 = float,class:(ml4w-hyprland-settings.py)
 windowrulev2 = size 700 600,class:(ml4w-hyprland-settings.py)
 windowrulev2 = center,class:(ml4w-hyprland-settings.py)

-# General floating
 windowrulev2 = float,class:(dotfiles-floating)
 windowrulev2 = size 1000 800,class:(dotfiles-floating)
 windowrulev2 = center,class:(dotfiles-floating)

-# XDG Desktop Portal
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-# QT
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-
-# GTK
-env = GDK_SCALE,1
-
-# Mozilla
-env = MOZ_ENABLE_WAYLAND,1
-
-# Set the cursor size for xcursor
-env = XCURSOR_SIZE,24
-
-# Disable appimage launcher by default
 env = APPIMAGELAUNCHER_DISABLE,1
+env = XCURSOR_SIZE,24
+env = XDG_CURRENT_DESKTOP,Hyprland

@@ -0,0 +1,7 @@
+# ----------------------------------------------------- 
+# Monitor Setup
+# name: "Default"
+# ----------------------------------------------------- 
+
+monitor=DP-1,preferred,0x0,2
+monitor=HDMI-A-1,3840x2160,1920x-180,2,transform,1
@@ -1 +1 @@
-source = ~/dotfiles/hypr/conf/windowrules/default.conf
+source = ~/dotfiles/hypr/conf/windowrules/custom.conf
@@ -0,0 +1,18 @@
+# ----------------------------------------------------- 
+# Window rules
+# ----------------------------------------------------- 
+
+windowrule = tile,^(Microsoft-edge)$
+windowrule = tile,^(Brave-browser)$
+windowrule = tile,^(Chromium)$
+windowrule = float,^(pavucontrol)$
+windowrule = float,^(blueman-manager)$
+windowrule = float,^(nm-connection-editor)$
+windowrule = float,^(qalculate-gtk)$
+windowrule = float,^(showmethekey-gtk)$
+windowrule = pin,^(showmethekey-gtk)$
+layerrule = blur, gtk-layer-shell
+layerrule = blur, logout_dialog
+
+windowrule = float,title=^(Mathematica)$
+windowrule = opacity 0.75, ^(Code)$
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = rgba(ffffffff)
    col.inactive_border = $color11
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -6,9 +6,8 @@
 general {
    gaps_in = 10
    gaps_out = 14
-    border_size = 3
+    border_size = 2
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -10,5 +10,4 @@ general {
    col.active_border = $color11
    col.inactive_border = rgba(ffffffff)
    layout = dwindle
-    resize_on_border = true
 }
@@ -43,7 +43,6 @@ input-field {

 label {
    monitor =
-    #clock
    text = cmd[update:1000] echo "$TIME"
    color = rgba(200, 200, 200, 1.0)
    font_size = 55
@@ -1,3 +1,3 @@
-preload = $HOME/wallpaper/default.jpg
-wallpaper = ,$HOME/wallpaper/default.jpg
+preload = $HOME/wallpaper/hyprland.jpg
+wallpaper = ,$HOME/wallpaper/hyprland.jpg
 splash = false
@@ -46,7 +46,6 @@ _commandExists "swww" "swww"
 _commandExists "eww" "eww"
 _commandExists "magick" "imagemagick"
 _commandExists "figlet" "figlet"
-_commandExists "waypaper" "waypaper"

 echo
 echo "Press return to exit"
@@ -7,18 +7,13 @@
 #

 if [ -f ~/.cache/gamemode ] ;then
-    hyprctl reload
+    hyprctl keyword animations:enabled true
+    hyprctl keyword decoration:blur:enabled true
    rm ~/.cache/gamemode
    notify-send "Gamemode deactivated" "Animations and blur enabled"
 else
-    hyprctl --batch "\
-        keyword animations:enabled 0;\
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:enabled 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
-	touch ~/.cache/gamemode
+    hyprctl keyword animations:enabled false
+    hyprctl keyword decoration:blur:enabled false
+    touch ~/.cache/gamemode
    notify-send "Gamemode activated" "Animations and blur disabled"
 fi
@@ -21,29 +21,13 @@ config_file=${config_file/source=~/}
 config_file="/home/$USER$config_file"
 echo "Reading from: $config_file"

-keybinds=""
-
-# Detect Start String
-while read -r line
-do
-    if [[ "$line" == "bind"* ]]; then
-
-        line="$(echo "$line" | sed 's/$mainMod/SUPER/g')"
-        line="$(echo "$line" | sed 's/bind = //g')"
-        line="$(echo "$line" | sed 's/bindm = //g')"
-
-        IFS='#' 
-        read -a strarr <<<"$line" 
-        kb_str=${strarr[0]}
-        cm_str=${strarr[1]}
-
-        IFS=',' 
-        read -a kbarr <<<"$kb_str" 
-
-        item="${kbarr[0]}  + ${kbarr[1]}"$'\r'"${cm_str:1}"
-        keybinds=$keybinds$item$'\n'
-    fi 
-done < "$config_file"
-
+# ----------------------------------------------------- 
+# Parse keybindings
+# ----------------------------------------------------- 
+keybinds=$(grep -oP '(?<=bind = ).*' $config_file)
+keybinds=$(echo "$keybinds" | sed 's/$mainMod/SUPER/g'| sed 's/,\([^,]*\)$/ = \1/' | sed 's/, exec//g' | sed 's/^,//g')
+# ----------------------------------------------------- 
+# Show keybindings in rofi
+# ----------------------------------------------------- 
 sleep 0.2
-rofi -dmenu -i -markup -eh 2 -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
+rofi -dmenu -i -replace -p "Keybinds" -config ~/dotfiles/rofi/config-compact.rasi <<< "$keybinds"
@@ -14,11 +14,10 @@ NAME="screenshot_$(date +%d%m%Y_%H%M%S).png"

 option2="Selected area"
 option3="Fullscreen (delay 3 sec)"
-option4="Current display (delay 3 sec)"

-options="$option2\n$option3\n$option4"
+options="$option2\n$option3"

-choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 3 -width 30 -p "Take Screenshot")
+choice=$(echo -e "$options" | rofi -dmenu -replace -config ~/dotfiles/rofi/config-screenshot.rasi -i -no-show-icons -l 2 -width 30 -p "Take Screenshot")

 case $choice in
    $option2)
@@ -34,12 +33,4 @@ case $choice in
        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
        swappy -f "$DIR$NAME"
    ;;
-    $option4)
-        sleep 3
-        monitor="$(hyprctl monitors | awk '/Monitor/{monitor=$2} /focused: yes/{print monitor; exit}')"
-        grim -o "$monitor" "$DIR$NAME"
-        xclip -selection clipboard -t image/png -i "$DIR$NAME"
-        notify-send "Screenshot created and copied to clipboard" "Mode: Fullscreen"
-        swappy -f "$DIR$NAME"
-    ;;
-esac
+esac
@@ -1,5 +0,0 @@
-#!/bin/bash
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
-rm $HOME/.cache/ml4w-wallpaper-generated/*
-echo ":: Wallpaper cache cleared"
-notify-send "Wallpaper cache cleared"
@@ -9,135 +9,181 @@
 # by Stephan Raabe (2024) 
 # ----------------------------------------------------- 

-# ----------------------------------------------------- 
-# Get selected wallpaper
-# ----------------------------------------------------- 
-echo ":: Using wallpaper $1"
-wallpaper=$1
-
-# ----------------------------------------------------- 
-# Check to use wallpaper cache
-# ----------------------------------------------------- 
-use_cache=0
-if [ -f $HOME/dotfiles/.settings/wallpaper_cache ] ;then
-    use_cache=1
+# Cache file for holding the current wallpaper
+wallpaper_folder="$HOME/wallpaper"
+if [ -f ~/dotfiles/.settings/wallpaper-folder.sh ] ;then
+    source ~/dotfiles/.settings/wallpaper-folder.sh
 fi
-
-if [ "$use_cache" == "1" ] ;then
-    echo ":: Using Wallpaper Cache"
-else
-    echo ":: Wallpaper Cache disabled"
-fi
-
-# ----------------------------------------------------- 
-# File and folder names
-# ----------------------------------------------------- 
-force_generate=0
-generated_versions="$HOME/.cache/ml4w-wallpaper-generated"
+used_wallpaper="$HOME/.cache/used_wallpaper"
 cache_file="$HOME/.cache/current_wallpaper"
-blurred_wallpaper="$HOME/.cache/blurred_wallpaper.png"
-square_wallpaper="$HOME/.cache/square_wallpaper.png"
+blurred="$HOME/.cache/blurred_wallpaper.png"
+square="$HOME/.cache/square_wallpaper.png"
 rasi_file="$HOME/.cache/current_wallpaper.rasi"
 blur_file="$HOME/dotfiles/.settings/blur.sh"

 blur="50x30"
 blur=$(cat $blur_file)

+# Create cache file if not exists
+if [ ! -f $cache_file ] ;then
+    touch $cache_file
+    echo "$wallpaper_folder/default.jpg" > "$cache_file"
+fi
+
 # Create rasi file if not exists
 if [ ! -f $rasi_file ] ;then
    touch $rasi_file
    echo "* { current-image: url(\"$wallpaper_folder/default.jpg\", height); }" > "$rasi_file"
 fi

-# Create folder with generated versions of wallpaper if not exists
-if [ ! -d $generated_versions ] ;then
-    mkdir $generated_versions
-fi
+current_wallpaper=$(cat "$cache_file")
+
+case $1 in
+
+    # Load wallpaper from .cache of last session 
+    "init")
+        sleep 1
+        if [ -f $cache_file ]; then
+            wal -q -i $current_wallpaper
+        else
+            wal -q -i $wallpaper_folder/
+        fi
+    ;;
+
+    # Select wallpaper with rofi
+    "select")
+        sleep 0.2
+        selected=$( find "$wallpaper_folder" -type f \( -iname "*.jpg" -o -iname "*.jpeg" -o -iname "*.png" \) -exec basename {} \; | sort -R | while read rfile
+        do
+            echo -en "$rfile\x00icon\x1f$wallpaper_folder/${rfile}\n"
+        done | rofi -dmenu -i -replace -config ~/dotfiles/rofi/config-wallpaper.rasi)
+        if [ ! "$selected" ]; then
+            echo "No wallpaper selected"
+            exit
+        fi
+        wal -q -i $wallpaper_folder/$selected
+    ;;
+
+    # Randomly select wallpaper 
+    *)
+        wal -q -i $wallpaper_folder/
+    ;;
+
+esac

 # ----------------------------------------------------- 
-# Current wallpaper
+# Load current pywal color scheme
 # ----------------------------------------------------- 
-current_wallpaper=$wallpaper
-current_wallpaper_filename=$(basename $current_wallpaper)
-echo ":: Current Wallpaper: $current_wallpaper"
-echo ":: Current Wallpaper Filename: $current_wallpaper_filename"
-newwall=$current_wallpaper_filename
-
-# ----------------------------------------------------- 
-# Execute pywal
-# ----------------------------------------------------- 
-echo ":: Execute wallpaper"
-wal -q -i $wallpaper
 source "$HOME/.cache/wal/colors.sh"

 # ----------------------------------------------------- 
-# Wallpaper Effects
-# -----------------------------------------------------
+# get wallpaper image name
+# ----------------------------------------------------- 
+newwall=$(echo $wallpaper | sed "s|$wallpaper_folder/||g")

+# ----------------------------------------------------- 
+# Reload waybar with new colors
+# -----------------------------------------------------
+~/dotfiles/waybar/launch.sh
+
+# ----------------------------------------------------- 
+# Set the new wallpaper
+# -----------------------------------------------------
+transition_type="wipe"
+# transition_type="outer"
+# transition_type="random"
+
+cp $wallpaper $HOME/.cache/
+mv $HOME/.cache/$newwall $used_wallpaper
+
+# Load Wallpaper Effect
 if [ -f $HOME/dotfiles/.settings/wallpaper-effect.sh ] ;then
    effect=$(cat $HOME/dotfiles/.settings/wallpaper-effect.sh)
    if [ ! "$effect" == "off" ] ;then
-        used_wallpaper=$generated_versions/$effect-$newwall
-        if [ -f $generated_versions/$effect-$newwall ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-            echo ":: Use cached wallpaper $effect-$newwall"
+        if [ "$1" == "init" ] ;then
+            echo ":: Init"
        else
-            echo ":: Generate new cached wallpaper $effect-$newwall with effect $effect"
-            if [ "$1" == "init" ] ;then
-                echo ":: Init"
-            else
-                dunstify "Using wallpaper effect $effect..." "with image $newwall" -h int:value:10 -h string:x-dunst-stack-tag:wallpaper
-            fi
-            source $HOME/dotfiles/hypr/effects/wallpaper/$effect
+            dunstify "Using wallpaper effect $effect..." "with image $newwall" -h int:value:10 -h string:x-dunst-stack-tag:wallpaper
        fi
-        echo ":: Loading wallpaper $generated_versions/$effect-$newwall with effect $effect"
-        killall -e hyprpaper & 
-        sleep 1; 
-        wal_tpl=$(cat $HOME/dotfiles/.settings/hyprpaper.tpl)
-        echo $wal_tpl
-        output=${wal_tpl//WALLPAPER/$used_wallpaper}
-        echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
-        hyprpaper & > /dev/null 2>&1
-    else
-        echo ":: Wallpaper effect is set to off"
+        source $HOME/dotfiles/hypr/effects/wallpaper/$effect
    fi
 fi

+wallpaper_engine=$(cat $HOME/dotfiles/.settings/wallpaper-engine.sh)
+if [ "$wallpaper_engine" == "swww" ] ;then
+    # swww
+    echo ":: Using swww"
+    swww img $used_wallpaper \
+        --transition-bezier .43,1.19,1,.4 \
+        --transition-fps=60 \
+        --transition-type=$transition_type \
+        --transition-duration=0.7 \
+        --transition-pos "$( hyprctl cursorpos )"
+elif [ "$wallpaper_engine" == "hyprpaper" ] ;then
+    # hyprpaper
+    echo ":: Using hyprpaper"
+    killall hyprpaper
+    wal_tpl=$(cat $HOME/dotfiles/.settings/hyprpaper.tpl)
+    output=${wal_tpl//WALLPAPER/$used_wallpaper}
+    echo "$output" > $HOME/dotfiles/hypr/hyprpaper.conf
+    hyprpaper &
+else
+    echo ":: Wallpaper Engine disabled"
+fi
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    sleep 1
+    dunstify "Changing wallpaper ..." "with image $newwall" -h int:value:25 -h string:x-dunst-stack-tag:wallpaper
+    
+    # ----------------------------------------------------- 
+    # Reload Hyprctl.sh
+    # -----------------------------------------------------
+    $HOME/.config/ml4w-hyprland-settings/hyprctl.sh &
+fi
+
 # ----------------------------------------------------- 
 # Created blurred wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/blur-$blur-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper blur-$blur-$newwall.png"
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
 else
-    echo ":: Generate new cached wallpaper blur-$blur-$newwall with blur $blur"
-    if [ "$1" == "init" ] ;then
-        echo ":: Init"
-    else
-        dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper
-    fi    
-    magick $wallpaper -resize 75% $blurred_wallpaper
-    echo ":: Resized to 75%"
-    if [ ! "$blur" == "0x0" ] ;then
-        magick $blurred_wallpaper -blur $blur $blurred_wallpaper
-        cp $blurred_wallpaper $generated_versions/blur-$blur-$newwall.png
-        echo ":: Blurred"
-    fi
-    cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper
+    dunstify "Creating blurred version ..." "with image $newwall" -h int:value:50 -h string:x-dunst-stack-tag:wallpaper
+fi
+
+magick $used_wallpaper -resize 75% $blurred
+echo ":: Resized to 75%"
+if [ ! "$blur" == "0x0" ] ;then
+    magick $blurred -blur $blur $blurred
+    echo ":: Blurred"
 fi
-cp $generated_versions/blur-$blur-$newwall.png $blurred_wallpaper

 # ----------------------------------------------------- 
-# Created square wallpaper
+# Created quare wallpaper
 # -----------------------------------------------------
-if [ -f $generated_versions/square-$newwall.png ] && [ "$force_generate" == "0" ] && [ "$use_cache" == "1" ] ;then
-    echo ":: Use cached wallpaper square-$newwall.png"
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
 else
-    echo ":: Generate new cached wallpaper square-$newwall"
-    if [ "$1" == "init" ] ;then
-        echo ":: Init"
-    else
-        dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper
-    fi
-    magick $wallpaper -gravity Center -extent 1:1 $square_wallpaper
-    cp $square_wallpaper $generated_versions/square-$newwall.png
+    dunstify "Creating square version ..." "with image $newwall" -h int:value:75 -h string:x-dunst-stack-tag:wallpaper
 fi
-cp $generated_versions/square-$newwall.png $square_wallpaper
+magick $wallpaper -gravity Center -extent 1:1 $square
+echo ":: Square version created"
+
+# ----------------------------------------------------- 
+# Write selected wallpaper into .cache files
+# ----------------------------------------------------- 
+echo "$wallpaper" > "$cache_file"
+echo "* { current-image: url(\"$blurred\", height); }" > "$rasi_file"
+
+# ----------------------------------------------------- 
+# Send notification
+# ----------------------------------------------------- 
+
+if [ "$1" == "init" ] ;then
+    echo ":: Init"
+else
+    dunstify "Wallpaper procedure complete!" "with image $newwall" -h int:value:100 -h string:x-dunst-stack-tag:wallpaper
+fi
+
+echo "DONE!"
@@ -15,7 +15,7 @@ killall -e xdg-desktop-portal-kde
 killall -e xdg-desktop-portal-lxqt
 killall -e xdg-desktop-portal-wlr
 killall -e xdg-desktop-portal-gtk
-killall -e xdg-desktop-portal
+killall xdg-desktop-portal
 sleep 1

 # start xdg-desktop-portal-hyprland
@@ -34,7 +34,7 @@ else
 fi
 echo ""
 source .install/required.sh
-source .install/confirm_start.sh
+source .install/confirm-start.sh
 source .install/paralleldownloads.sh
 source .install/yay.sh
 source .install/updatesystem.sh
@@ -44,45 +44,38 @@ source .install/installer.sh
 source .install/remove.sh
 source .install/general.sh
 source .install/packages/general-packages.sh
-source .install/install_packages.sh
+source .install/install-packages.sh
+source .install/fcitx5.sh
 source .install/profile.sh
 if [[ $profile == *"Hyprland"* ]]; then
    echo -e "${GREEN}"
    figlet "Hyprland"
    echo -e "${NONE}"
    source .install/packages/hyprland-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
    echo -e "${GREEN}"
    figlet "Qtile"
    echo -e "${NONE}"
    source .install/packages/qtile-packages.sh
-    source .install/install_packages.sh
+    source .install/install-packages.sh
 fi
 source .install/wallpaper.sh
 source .install/displaymanager.sh
 source .install/issue.sh
-
-# Modify existing files before restore starts
-source .install/before_restore.sh
-
-# Restore configuration and settings
 source .install/restore.sh
-
-# Setup the input devices
 source .install/keyboard.sh
-
 source .install/neovim.sh
 source .install/hook.sh
 source .install/vm.sh
 source .install/copy.sh
 source .install/init-pywal.sh
 if [[ $profile == *"Hyprland"* ]]; then
-    source .install/hyprland_dotfiles.sh
+    source .install/hyprland-dotfiles.sh
 fi
 if [[ $profile == *"Qtile"* ]]; then
-    source .install/qtile_dotfiles.sh
+    source .install/qtile-dotfiles.sh
 fi
 source .install/settings.sh
 source .install/apps.sh
@@ -31,13 +31,3 @@ set ttyfast                 " Speed up scrolling in Vim
 " set spell                 " enable spell check (may need to download language package)
 " set noswapfile            " disable creating swap file
 " set backupdir=~/.cache/vim " Directory to store backup files.
-
-hi NonText ctermbg=none guibg=NONE
-hi Normal guibg=NONE ctermbg=NONE
-hi NormalNC guibg=NONE ctermbg=NONE
-hi SignColumn ctermbg=NONE ctermfg=NONE guibg=NONE
-
-hi Pmenu ctermbg=NONE ctermfg=NONE guibg=NONE
-hi FloatBorder ctermbg=NONE ctermfg=NONE guibg=NONE
-hi NormalFloat ctermbg=NONE ctermfg=NONE guibg=NONE
-hi TabLine ctermbg=None ctermfg=None guibg=None
@@ -43,7 +43,7 @@ configuration {
 window {
    width:                        400px;
    x-offset:                     -14px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +56,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +120,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -160,7 +161,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +172,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -57,7 +57,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -121,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -161,7 +162,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -171,7 +173,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -56,7 +56,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +132,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +170,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -56,7 +56,7 @@ window {
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -132,7 +132,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -170,7 +170,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -57,7 +57,7 @@ window {
    anchor:                       northeast;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -133,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +171,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -43,7 +43,7 @@ configuration {
 window {
    width:                        400px;
    x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -56,7 +56,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -120,6 +120,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -132,7 +133,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -160,7 +161,8 @@ listview {
    padding:                      10px;
    margin:                       0px;
    background-color:             @background;
-    border:0px;
+    border:                       0px;
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -170,7 +172,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -38,7 +38,7 @@ configuration {
 window {
    width:                        761px;
    x-offset:                     0px;
-    y-offset:                     65px;
+    y-offset:                     14px;
    spacing:                      0px;
    padding:                      0px;
    margin:                       0px; 
@@ -51,7 +51,7 @@ window {
    anchor:                       north;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -114,6 +114,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -126,7 +127,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -151,11 +152,11 @@ listview {
    spacing:                      10px;
    padding:                      10px;
    margin:                       0px;
-    fixed-height:                 true;
-    fixed-columns:                true;    
+    fixed-height:                true;
+    fixed-columns:               true;
    background-color:             @background;
    border:                       0px;
-    flow:                         horizontal;      
+    border-radius:                0px;
 }

 /* ---- Element ---- */
@@ -165,7 +166,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
    orientation:                  vertical;
 }
@@ -50,14 +50,14 @@ window {
    margin:                       0px; 
    color:                        #FFFFFF;
    border:                       @border-width;
-    border-color:                 #FFFFFF;
+    border-color:                 @foreground;
    cursor:                       "default";
    transparency:                 "real";
    location:                     center;
    anchor:                       center;
    fullscreen:                   false;
    enabled:                      true;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             transparent;
 }

@@ -99,7 +99,7 @@ inputbar {
    text-color:                   @foreground;
    spacing:                      10px;
    padding:                      15px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border-color:                 @foreground;
    background-color:             @background;
    children:                     [ "textbox-prompt-colon", "entry" ];
@@ -121,6 +121,7 @@ entry {
    cursor:                       text;
    placeholder:                  "Search";
    placeholder-color:            inherit;
+    border-radius:                0px;
 }

 /* ---- Mode Switcher ---- */
@@ -133,7 +134,7 @@ mode-switcher{

 button {
    padding:                      10px;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    background-color:             @background;
    text-color:                   inherit;
    cursor:                       pointer;
@@ -171,7 +172,7 @@ element {
    margin:                       5px;
    cursor:                       pointer;
    background-color:             @background;
-    border-radius:                10px;
+    border-radius:                @border-radius;
    border:                       @border-width;
 }

@@ -25,7 +25,7 @@ sleep 0.2
 # ----------------------------------------------------- 
 # Default theme: /THEMEFOLDER;/VARIATION
 # ----------------------------------------------------- 
-themestyle="/ml4w-blur;/ml4w-blur/white"
+themestyle="/ml4w;/ml4w/light"

 # ----------------------------------------------------- 
 # Get current theme information from .cache/.themestyle.sh
@@ -38,7 +38,7 @@ else
 fi

 IFS=';' read -ra arrThemes <<< "$themestyle"
-echo ":: Theme: ${arrThemes[0]}"
+echo "Theme: ${arrThemes[0]}"

 if [ ! -f ~/dotfiles/waybar/themes${arrThemes[1]}/style.css ]; then
    themestyle="/ml4w;/ml4w/light"
@@ -11,8 +11,6 @@
 {
    // Workspaces
    "hyprland/workspaces" : {
-        "on-scroll-up": "hyprctl dispatch workspace r-1",
-        "on-scroll-down": "hyprctl dispatch workspace r+1",        
        "on-click": "activate",
        "active-only": false,
        "all-outputs": true,
@@ -110,7 +108,7 @@
    // Wallpaper
    "custom/wallpaper": {
        "format": "",
-        "on-click": "waypaper",
+        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper-effects.sh",
        "tooltip-format": "Left: Select a wallpaper\nRight: Select wallpaper effect"
    },
@@ -136,6 +134,20 @@
        "tooltip": false
    },

+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/filemanager.sh",
+        "tooltip-format": "Open the filemanager"
+    },
+
+    // Browser Launcher
+    "custom/browser": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip-format": "Open the browser"
+    },    
+
    // ChatGPT Launcher
    "custom/chatgpt": {
        "format": " ",
@@ -147,7 +159,7 @@
    "custom/calculator": {
        "format": "",
        "on-click": "qalculate-gtk",
-        "tooltip-format": "Open calculator"
+        "tooltip": false
    },

    // Windows VM
@@ -301,6 +313,15 @@
        ]
    },

+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/browser",
+            "custom/filemanager",
+         ]
+    },
+
    // Network
    "network": {
        "format": "{ifname}",
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="black" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="white" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="white" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,18 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" role="img">
-  <!-- Define the mask for the cutouts -->
-  <mask id="cutoutMask">
-    <!-- Circle -->
-    <circle fill="#19cddb" cx="120" cy="120" r="120" />
-    
-    <!-- Big L Shape -->
-    <rect x="60" y="165" width="120" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="60" y="60" width="15" height="120" rx="4" ry="4" fill="black"/>
-    
-    <!-- Little L Shape -->
-    <rect x="110" y="120" width="75" height="15" rx="4" ry="4" fill="black"/>
-    <rect x="110" y="55" width="15" height="80" rx="4" ry="4" fill="black"/>
-  </mask>
-
-  <!-- Circle with cutouts -->
-  <circle fill="#19cddb" cx="120" cy="120" r="120" mask="url(#cutoutMask)" />
-</svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 24 24" role="img" xmlns="http://www.w3.org/2000/svg"><title>OpenAI icon</title><path d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/></svg>
@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+ @import '../../../../../.cache/wal/colors-waybar.css';
+
+ @define-color backgroundlight @color5;
+ @define-color backgrounddark @color11;
+ @define-color workspacesbackground1 @color5;
+ @define-color workspacesbackground2 @color11;
+ @define-color bordercolor @color11;
+ @define-color textcolor1 #FFFFFF;
+ @define-color textcolor2 #FFFFFF;
+ @define-color textcolor3 #FFFFFF;
+ @define-color iconcolor #FFFFFF;
+ 
+ @import '../style.css';
@@ -0,0 +1,73 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+
+    // Position TOP
+    "layer": "top",
+    "margin-bottom": 0,
+
+    // Position BOTTOM
+    // "position": "bottom",
+    // "margin-top": 0,
+    // "margin-bottom": 14,
+    
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/themes/custom/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenu",
+        "custom/settings",
+        "custom/waybarthemes",
+        "custom/wallpaper",
+        // START TASK TOOGLE
+        // "wlr/taskbar",
+        // END TASK TOOGLE
+        "group/quicklinks",
+        "hyprland/window",
+        "custom/starter"
+    ],
+
+    // Modules Center
+    "modules-center": [
+        "hyprland/workspaces"
+    ],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        // START BT TOOGLE
+        "bluetooth",
+        // END BT TOOGLE
+        "battery", 
+        // START NETWORK TOOGLE
+        "network",
+        // END NETWORK TOOGLE
+        "group/hardware",
+        "custom/cliphist",
+        // START IDLE TOOGLE
+        "idle_inhibitor",
+        // END IDLE TOOGLE
+        // START TRAY TOOGLE
+        "tray",
+        // END TRAY TOOGLE
+        "custom/exit",
+        "custom/ml4w-welcome",
+        "clock"
+    ]
+}
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="Custum 4k"
@@ -0,0 +1,330 @@
+//  __  __           _       _            
+// |  \/  | ___   __| |_   _| | ___  ___  
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
+// | |  | | (_) | (_| | |_| | |  __/\__ \ 
+// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
+//                                        
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // Workspaces
+    "hyprland/workspaces" : {
+        "on-click": "activate",
+        "active-only": false,
+        "all-outputs": true,
+        "format": "{}",
+        "format-icons": {
+			"urgent": "",
+			"active": "",
+			"default": ""
+        },
+        "persistent-workspaces": {
+             "*": 5
+        }       
+    },
+
+    // Taskbar
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 18,
+        "tooltip-format": "{title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+           "Alacritty"
+        ],
+        "app_ids-mapping": {
+            "firefoxdeveloperedition": "firefox-developer-edition"
+        },
+        "rewrite": {
+            "Firefox Web Browser": "Firefox",
+            "Foot Server": "Terminal"
+        }
+    },
+
+    // Hyprland Window
+    "hyprland/window": {
+        "rewrite": {
+            "(.*) - Brave": "$1",
+            "(.*) - Chromium": "$1",
+            "(.*) - Brave Search": "$1",
+            "(.*) - Outlook": "$1",
+            "(.*) Microsoft Teams": "$1"
+        },
+        "separate-outputs": true
+    },
+
+    // Cliphist
+    "custom/cliphist": {
+        "format": "",
+        "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
+        "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
+        "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
+        "tooltip": false
+    },
+
+    // Updates Count
+    "custom/updates": {
+        "format": "  {}",
+        "tooltip-format": "{}",
+        "escape": true,
+        "return-type": "json",       
+        "exec": "~/dotfiles/scripts/updates.sh",
+        "restart-interval": 60,
+        "on-click": "alacritty -e ~/dotfiles/scripts/installupdates.sh",
+        "tooltip": false
+    },
+
+    // Theme Starter Label
+    "custom/starter": {
+        "format": "THEME STARTER",
+        "tooltip": false
+    },
+    
+    // Wallpaper
+    "custom/wallpaper": {
+        "format": "",
+        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
+        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
+        "tooltip": false
+    },
+
+    // Waybar Themes
+    "custom/waybarthemes": {
+        "format": "",
+        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
+        "tooltip": false
+    },
+    
+    // Settings
+    "custom/settings": {
+        "format": "",
+        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/hypr/settings/settings.sh",
+        "tooltip": false
+    },
+
+    // Keybindings
+    "custom/keybindings": {
+        "format": "",
+        "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "tooltip": false
+    },
+
+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "thunar",
+        "tooltip": false
+    },
+
+    // Browser Launcher
+    "custom/browser": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip": false
+    },    
+
+    // ML4W Welcome App
+    "custom/ml4w-welcome": {
+        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+        "format": " ",
+        "tooltip": false
+    },
+
+    // ChatGPT Launcher
+    "custom/chatgpt": {
+        "format": "",
+        "on-click": "chromium --app=https://chat.openai.com",
+        "tooltip": false
+    },
+
+    // Rofi Application Launcher
+    "custom/appmenu": {
+        "format": "Apps",
+        "on-click": "rofi -show drun -replace",
+        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "tooltip": false
+    },
+    
+    // Power Menu
+    "custom/exit": {
+        "format": "",
+        "on-click": "wlogout",
+        "tooltip": false
+    },
+
+    // Keyboard State
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+
+    // System tray
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+
+    // Clock
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+
+    // System
+    "custom/system": {
+        "format": "",
+        "tooltip": false
+    },
+
+    // CPU
+    "cpu": {
+        "format": "/ C {usage}% ",
+        "on-click": "alacritty -e htop"
+    },
+
+    // Memory
+    "memory": {
+        "format": "/ M {}% ",
+        "on-click": "alacritty -e htop"
+    },
+
+    // Harddisc space used
+    "disk": {
+        "interval": 30,
+        "format": "D {percentage_used}% ",
+        "path": "/",
+        "on-click": "alacritty -e htop"
+    }, 
+
+    "hyprland/language": {
+        "format": "/ K {short}"
+    },
+
+    // Group Hardware
+    "group/hardware": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },        
+        "modules": [
+            "custom/system",
+            "disk",
+            "cpu",
+            "memory",
+            "hyprland/language"
+        ]
+    },
+    
+    // Group Settings
+    "group/settings": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },        
+        "modules": [
+            "custom/settings",
+            "custom/waybarthemes",
+            "custom/wallpaper"
+        ]
+    },
+
+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/filemanager",
+            "custom/browser"
+         ]
+    },
+
+    // Network
+    "network": {
+        "format": "{ifname}",
+        "format-wifi": "   {signalStrength}%",
+        "format-ethernet": "  {ipaddr}",
+        "format-disconnected": "Not connected", //An empty format will hide the module.
+        "tooltip-format": " {ifname} via {gwaddri}",
+        "tooltip-format-wifi": "   {essid} ({signalStrength}%)",
+        "tooltip-format-ethernet": "  {ifname} ({ipaddr}/{cidr})",
+        "tooltip-format-disconnected": "Disconnected",
+        "max-length": 50,
+        "on-click": "alacritty -e nmtui"
+    },
+
+    // Battery
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{icon}   {capacity}%",
+        "format-charging": "  {capacity}%",
+        "format-plugged": "  {capacity}%",
+        "format-alt": "{icon}  {time}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": [" ", " ", " ", " ", " "]
+    },
+
+    // Pulseaudio
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon} {volume}%",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", " ", " "]
+        },
+        "on-click": "pavucontrol"
+    },
+
+    // Bluetooth
+    "bluetooth": {
+        "format-disabled": "",
+        "format-off": "",
+        "interval": 30,
+        "on-click": "blueman-manager",
+        "format-no-controller": ""
+    },
+
+    // Other
+    "user": {
+        "format": "{user}",
+        "interval": 60,
+        "icon": false,
+    },
+
+    // Idle Inhibator
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "tooltip": true,
+        "format-icons":{
+            "activated": "",
+            "deactivated": ""
+        },
+        "on-click-right": "hyprlock"        
+    }
+}
@@ -0,0 +1,430 @@
+/*
+ * __        __          _                  ____  _         _       
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
+ *                 |___/                              |___/         
+ *  
+ * by Stephan Raabe (2023) 
+ * ----------------------------------------------------- 
+*/
+
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+/* @import 'style-light.css'; */
+/* @define-color backgroundlight #FFFFFF;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 #FFFFFF;
+@define-color workspacesbackground2 #CCCCCC;
+@define-color bordercolor #FFFFFF;
+@define-color textcolor1 #000000;
+@define-color textcolor2 #000000;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF; */
+
+/* -----------------------------------------------------
+ * General 
+ * ----------------------------------------------------- */
+
+* {
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0,0.2);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+/* -----------------------------------------------------
+ * Workspaces 
+ * ----------------------------------------------------- */
+
+#workspaces {
+    margin: 5px 1px 6px 1px;
+    padding: 0px 1px;
+    border-radius: 15px;
+    border: 0px;
+    font-weight: bold;
+    font-style: normal;
+    font-size: 16px;
+    color: @textcolor1;
+}
+
+#workspaces button {
+    padding: 0px 5px;
+    margin: 4px 3px;
+    border-radius: 15px;
+    border: 0px;
+    color: @textcolor3;
+    transition: all 0.3s ease-in-out;
+}
+
+#workspaces button.active {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    min-width: 40px;
+    transition: all 0.3s ease-in-out;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+}
+
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Window
+ * ----------------------------------------------------- */
+
+#window {
+    background: @backgroundlight;
+    margin: 10px 15px 10px 0px;
+    padding: 2px 10px 0px 10px;
+    border-radius: 12px;
+    color:@textcolor2;
+    font-size:16px;
+    font-weight:normal;
+}
+
+window#waybar.empty #window {
+    background-color:transparent;
+}
+
+/* -----------------------------------------------------
+ * Taskbar
+ * ----------------------------------------------------- */
+
+#taskbar {
+    background: @backgroundlight;
+    margin: 6px 15px 6px 0px;
+    padding:0px;
+    border-radius: 15px;
+    font-weight: normal;
+    font-style: normal;
+    border: 3px solid @backgroundlight;
+}
+
+#taskbar button {
+    margin:0;
+    border-radius: 15px;
+    padding: 0px 5px 0px 5px;
+}
+
+/* -----------------------------------------------------
+ * Modules
+ * ----------------------------------------------------- */
+
+.modules-left > widget:first-child > #workspaces {
+    margin-left: 0;
+}
+
+.modules-right > widget:last-child > #workspaces {
+    margin-right: 0;
+}
+
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    color: @iconcolor;
+}
+ 
+ #custom-waybarthemes,#custom-system {
+     margin-right:15px;
+ }
+
+
+ #custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+ #idle_inhibitor {
+    margin-right: 15px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 15px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Modules
+ * ----------------------------------------------------- */
+
+#custom-appmenu {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 10px;
+}
+
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
+
+#custom-exit {
+    margin: 0px 20px 0px 0px;
+    padding:0px;
+    font-size:20px;
+    color: @iconcolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
+#custom-updates {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#custom-updates.green {
+    background-color: @backgroundlight;
+}
+
+#custom-updates.yellow {
+    background-color: #ff9a3c;
+    color: #FFFFFF;
+}
+
+#custom-updates.red {
+    background-color: #dc2f2f;
+    color: #FFFFFF;
+}
+
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
+#custom-youtube {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+/* -----------------------------------------------------
+ * Hardware Group
+ * ----------------------------------------------------- */
+
+ #disk,#memory,#cpu,#language {
+    margin:0px;
+    padding:0px;
+    font-size:16px;
+    color:@iconcolor;
+}
+
+#language {
+    margin-right:10px;
+}
+
+/* -----------------------------------------------------
+ * Clock
+ * ----------------------------------------------------- */
+
+#clock {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+/* -----------------------------------------------------
+ * Pulseaudio
+ * ----------------------------------------------------- */
+
+#pulseaudio {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#pulseaudio.muted {
+    background-color: @backgrounddark;
+    color: @textcolor1;
+}
+
+/* -----------------------------------------------------
+ * Network
+ * ----------------------------------------------------- */
+
+#network {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#network.ethernet {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+#network.wifi {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Bluetooth
+ * ----------------------------------------------------- */
+
+ #bluetooth, #bluetooth.on, #bluetooth.connected {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#bluetooth.off {
+    background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+}
+
+/* -----------------------------------------------------
+ * Battery
+ * ----------------------------------------------------- */
+
+#battery {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 15px 0px 10px;
+    margin: 10px 15px 10px 0px;
+}
+
+#battery.charging, #battery.plugged {
+    color: @textcolor2;
+    background-color: @backgroundlight;
+}
+
+@keyframes blink {
+    to {
+        background-color: @backgroundlight;
+        color: @textcolor2;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: @textcolor3;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */
+
+#tray {
+    background-color: #2980b9;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+    background-color: #eb4d4b;
+}
+
+/* -----------------------------------------------------
+ * Other
+ * ----------------------------------------------------- */
+
+label:focus {
+    background-color: #000000;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    background-color: #2980b9;
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
@@ -20,10 +20,5 @@ window#waybar {
 }

 #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
 }
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
-}
-
@@ -19,10 +19,7 @@
    "spacing": 0,

    // Load Modules
-    "include": [
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
+    "include": ["~/dotfiles/waybar/modules.json"],

    // Modules Left
    "modules-left": [
@@ -18,11 +18,3 @@
 window#waybar {
    background-color: rgba(255,255,255,0.1);
 }
-
-#custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-white.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-white.svg");
-}
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Custom Colored"
@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color5;
+@define-color backgrounddark @color11;
+@define-color workspacesbackground1 @color5;
+@define-color workspacesbackground2 @color11;
+@define-color bordercolor @color11;
+@define-color textcolor1 #FFFFFF;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';
@@ -0,0 +1,59 @@
+// __        __          _                 
+// \ \      / /_ _ _   _| |__   __ _ _ __  
+//  \ \ /\ / / _` | | | | '_ \ / _` | '__| 
+//   \ V  V / (_| | |_| | |_) | (_| | |    
+//    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    
+//                 |___/                   
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // General Settings
+    "layer": "top",
+    "margin-top": 0,
+    "margin-bottom": 0,
+    "layer": "top",
+    "margin-left": 0,
+    "margin-right": 0,    
+    "spacing": 0,
+
+    // Load Modules
+    "include": ["~/dotfiles/waybar/themes/ml4w-blur-custom/modules.json"],
+
+    // Modules Left
+    "modules-left": [
+        "custom/appmenuicon",
+        "hyprland/workspaces",
+        //"custom/appmenu",
+        //"group/settings",
+        "wlr/taskbar",
+        //"group/quicklinks",
+        "hyprland/window",
+        "custom/empty"
+    ],
+
+    // Modules Center
+    //"modules-center": [
+    //    "hyprland/workspaces"
+    //],
+
+    // Modules Right    
+    "modules-right": [
+        "custom/updates",
+        "pulseaudio",
+        //"bluetooth",
+        "battery",
+        "battery#charging",
+        "network",
+        "cpu",
+        "memory",
+        //"group/hardware",
+        //"custom/cliphist",
+        "tray",
+        "idle_inhibitor",
+        "custom/exit",
+        //"custom/ml4w-welcome",
+        "clock"
+    ]
+}
@@ -0,0 +1,2 @@
+#!/bin/bash
+theme_name="ML4W Blur Mixed"
@@ -0,0 +1,16 @@
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+@import '../../../../../.cache/wal/colors-waybar.css';
+
+@define-color backgroundlight @color8;
+@define-color backgrounddark #FFFFFF;
+@define-color workspacesbackground1 @color8;
+@define-color workspacesbackground2 #FFFFFF;
+@define-color bordercolor @color8;
+@define-color textcolor1 @color8;
+@define-color textcolor2 #FFFFFF;
+@define-color textcolor3 #FFFFFF;
+@define-color iconcolor #FFFFFF;
+
+@import '../style.css';
@@ -0,0 +1,402 @@
+//  __  __           _       _            
+// |  \/  | ___   __| |_   _| | ___  ___  
+// | |\/| |/ _ \ / _` | | | | |/ _ \/ __| 
+// | |  | | (_) | (_| | |_| | |  __/\__ \ 
+// |_|  |_|\___/ \__,_|\__,_|_|\___||___/ 
+//                                        
+//  
+// by Stephan Raabe (2023) 
+// ----------------------------------------------------- 
+//
+{
+    // Workspaces
+    "hyprland/workspaces" : {
+        "on-click": "activate",
+        "active-only": false,
+        "all-outputs": true,
+        "format": "{}",
+        "format-icons": {
+			"urgent": "",
+			"active": "",
+			"default": ""
+        },
+        "persistent-workspaces": {
+            // START WORKSPACES
+            "*": 3
+            // END WORKSPACES
+        }       
+    },
+
+    // Taskbar
+    "wlr/taskbar": {
+        "format": "{icon}",
+        "icon-size": 18,
+        "tooltip-format": "{title}",
+        "on-click": "activate",
+        "on-click-middle": "close",
+        "ignore-list": [
+           "Alacritty"
+        ],
+        "app_ids-mapping": {
+            "firefoxdeveloperedition": "firefox-developer-edition"
+        },
+        "rewrite": {
+            "Firefox Web Browser": "Firefox",
+            "Foot Server": "Terminal"
+        }
+    },
+
+    // Hyprland Window
+    "hyprland/window": {
+        "rewrite": {
+            "(.*) - Brave": "$1",
+            "(.*) - Chromium": "$1",
+            "(.*) - Brave Search": "$1",
+            "(.*) - Outlook": "$1",
+            "(.*) Microsoft Teams": "$1"
+        },
+        "separate-outputs": true
+    },
+
+    // ML4W Welcome App
+    "custom/ml4w-welcome": {
+        "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
+        "format": " ",
+        "tooltip": false
+    },
+
+    // Empty
+    "custom/empty": {
+        "format": ""
+    },
+
+    // Youtube Subscriber Count
+    "custom/youtube": {
+        "format": " {}",
+        "exec": "python ~/private/youtube.py",
+        "restart-interval": 600,
+        "on-click": "chromium https://studio.youtube.com",
+        "tooltip": false
+    },
+    
+    // Cliphist
+    "custom/cliphist": {
+        "format": "",
+        "on-click": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh",
+        "on-click-right": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh d",
+        "on-click-middle": "sleep 0.1 && ~/dotfiles/scripts/cliphist.sh w",
+        "tooltip": false
+    },
+
+    // Updates Count
+    "custom/updates": {
+        "format": "  {}",
+        "tooltip-format": "{}",
+        "escape": true,
+        "return-type": "json",       
+        "exec": "~/dotfiles/scripts/updates.sh",
+        "restart-interval": 60,
+        "on-click": "alacritty --class dotfiles-floating -e ~/dotfiles/scripts/installupdates.sh",
+        "on-click-right": "~/dotfiles/.settings/software.sh",
+        "tooltip": false
+    },
+    
+    // Wallpaper
+    "custom/wallpaper": {
+        "format": "",
+        "on-click": "~/dotfiles/hypr/scripts/wallpaper.sh select",
+        "on-click-right": "~/dotfiles/hypr/scripts/wallpaper.sh",
+        "tooltip": false
+    },
+
+    // Waybar Themes
+    "custom/waybarthemes": {
+        "format": "",
+        "on-click": "~/dotfiles/waybar/themeswitcher.sh",
+        "tooltip": false
+    },
+    
+    // Settings
+    "custom/settings": {
+        "format": "",
+        "on-click": "~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage",
+        "tooltip": false
+    },
+
+    // Keybindings
+    "custom/keybindings": {
+        "format": "",
+        "on-click": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "tooltip": false
+    },
+
+    // Filemanager Launcher
+    "custom/filemanager": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/filemanager.sh",
+        "tooltip": false
+    },
+
+    // Outlook Launcher
+    "custom/outlook": {
+        "format": "",
+        "on-click": "chromium --app=https://outlook.office.com/mail/",
+        "tooltip": false
+    },
+
+    // Teams Launcher
+    "custom/teams": {
+        "format": "",
+        "on-click": "chromium --app=https://teams.microsoft.com/go",
+        "tooltip": false
+    },
+
+    // Browser Launcher
+    "custom/browser": {
+        "format": "",
+        "on-click": "~/dotfiles/.settings/browser.sh",
+        "tooltip": false
+    },    
+
+    // ChatGPT Launcher
+    "custom/chatgpt": {
+        "format": " ",
+        "on-click": "chromium --app=https://chat.openai.com",
+        "tooltip": false
+    },
+
+    // Calculator
+    "custom/calculator": {
+        "format": "",
+        "on-click": "qalculate-gtk",
+        "tooltip": false
+    },
+
+    // Windows VM
+    "custom/windowsvm": {
+        "format": "",
+        "on-click": "~/dotfiles/scripts/launchvm.sh",
+        "tooltip": false
+    },
+
+    // Rofi Application Launcher
+    "custom/appmenu": {
+        // START APPS LABEL
+        "format": "Apps",
+        // END APPS LABEL
+        "on-click": "sleep 0.2;rofi -show drun -replace",
+        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "tooltip": false
+    },
+
+    // Rofi Application Launcher
+    "custom/appmenuicon": {
+        "format": "",
+        "on-click": "rofi -show drun -replace",
+        "on-click-right": "~/dotfiles/hypr/scripts/keybindings.sh",
+        "tooltip": false
+    },    
+
+    // Power Menu
+    "custom/exit": {
+        "format": "",
+        "on-click": "wlogout",
+        "tooltip": false
+    },
+
+    // Keyboard State
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+
+    // System tray
+    "tray": {
+        "icon-size": 21,
+        "spacing": 10,
+        "verse-direction": true
+    },
+
+    // Clock
+    "clock": {
+        // TIMEDATEFORMAT
+        "format": "{:%H:%M - %a}",
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        // START CLOCK FORMAT
+        "format-alt": "{:%Y-%m-%d}"
+        // END CLOCK FORMAT
+    },
+
+    // System
+    "custom/system": {
+        "format": "",
+        "tooltip": false
+    },
+
+    // CPU
+    "cpu": {
+        "format": "󰒇  {usage}%",
+        "on-click": "alacritty -e htop"
+    },
+
+    // Memory
+    "memory": {
+        "format": "󰍛  {used:0.1f}G",
+        "on-click": "alacritty -e htop"
+    },
+
+    // Harddisc space used
+    "disk": {
+        "interval": 30,
+        "format": "D {percentage_used}% ",
+        "path": "/",
+        "on-click": "alacritty -e htop"
+    }, 
+
+    "hyprland/language": {
+        "format": "/ K {short}"
+    },
+
+    // Group Hardware
+    "group/hardware": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },        
+        "modules": [
+            "custom/system",
+            "disk",
+            "cpu",
+            "memory",
+            "hyprland/language"
+        ]
+    },
+    
+    // Group Settings
+    "group/settings": {
+        "orientation": "horizontal",
+        "modules": [
+            // START CHATGPT TOOGLE
+            "custom/chatgpt",
+            // END CHATGPT TOOGLE
+            "custom/settings",
+            "custom/waybarthemes",
+            "custom/wallpaper"
+        ]
+    },
+
+    // Group Quicklinks
+    "group/quicklinks": {
+        "orientation": "horizontal",
+        "modules": [
+            "custom/browser",
+            "custom/filemanager",
+         ]
+    },
+
+    // Network
+    "network": {
+        "format": "{ifname}",
+        "format-wifi": "   {signalStrength}%",
+        "format-ethernet": "  {ifname}",
+        "format-disconnected": "Disconnected",
+        "tooltip-format": " {ifname} via {gwaddri}",
+        "tooltip-format-wifi": "  {ifname} @ {essid}\nIP: {ipaddr}\nStrength: {signalStrength}%\nFreq: {frequency}MHz\nUp: {bandwidthUpBits} Down: {bandwidthDownBits}",
+        "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
+        "tooltip-format-disconnected": "Disconnected",
+        "max-length": 50,
+        "on-click": "~/dotfiles/.settings/networkmanager.sh"
+    },
+
+    // Battery
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{icon}  {capacity}%",
+        "format-charging": "",
+        "format-plugged": "  {capacity}%",
+        "format-alt": "{icon}  {time}",
+        // "format-good": "", // An empty format will hide the module
+        "format-full": "󱟢 {capacity}%",
+        //"format-icons": {
+        //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
+        //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+        //}
+        "format-icons": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+    },
+    "battery#charging": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "",
+        "format-charging": "{icon}  {capacity}%",
+        // "format-good": "", // An empty format will hide the module
+        //"format-icons": {
+        //    "Charging": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"],
+        //    "default": ["󱃍","󰁺","󰁻","󰁼","󰁽","󰁾","󰁿","󰂀","󰂁","󰂂","󰁹"]
+        //}
+        "format-icons": ["󰢟","󰢜","󰂆","󰂇","󰂈","󰢝","󰂉","󰢞","󰂊","󰂋","󰂅"]
+    },
+
+    // Pulseaudio
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{icon}",
+        "format-bluetooth": "{icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+
+    // Bluetooth
+    "bluetooth": {
+        "format": " {status}",
+        "format-disabled": "",
+        "format-off": "",
+        "interval": 30,
+        "on-click": "blueman-manager",
+        "format-no-controller": ""
+    },
+
+    // Other
+    "user": {
+        "format": "{user}",
+        "interval": 60,
+        "icon": false,
+    },
+
+    // Idle Inhibator
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "tooltip": true,
+        "format-icons":{
+            "activated": "",
+            "deactivated": ""
+        },
+        "on-click-right": "hyprlock"        
+    }
+}
@@ -0,0 +1,431 @@
+/*
+ * __        __          _                  ____  _         _       
+ * \ \      / /_ _ _   _| |__   __ _ _ __  / ___|| |_ _   _| | ___  
+ *  \ \ /\ / / _` | | | | '_ \ / _` | '__| \___ \| __| | | | |/ _ \ 
+ *   \ V  V / (_| | |_| | |_) | (_| | |     ___) | |_| |_| | |  __/ 
+ *    \_/\_/ \__,_|\__, |_.__/ \__,_|_|    |____/ \__|\__, |_|\___| 
+ *                 |___/                              |___/         
+ *  
+ * by Stephan Raabe (2023) 
+ * ----------------------------------------------------- 
+*/
+
+/* -----------------------------------------------------
+ * Import Pywal colors 
+ * ----------------------------------------------------- */
+/* @import 'style-light.css'; */
+
+/* -----------------------------------------------------
+ * General 
+ * ----------------------------------------------------- */
+
+* {
+    font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    border: none;
+    border-radius: 0px;
+}
+
+window#waybar {
+    background-color: rgba(0,0,0,0.2);
+    border-bottom: 0px solid #ffffff;
+    /* color: #FFFFFF; */
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+/* -----------------------------------------------------
+ * Workspaces 
+ * ----------------------------------------------------- */
+
+#workspaces {
+    background: @workspacesbackground1;
+    margin: 5px 10px 6px 0px;
+    padding: 0px 1px;
+    border-radius: 15px;
+    border: 0px;
+    font-weight: bold;
+    font-style: normal;
+    opacity: 0.8;
+    font-size: 16px;
+    color: @textcolor1;
+}
+
+#workspaces button {
+    padding: 0px 5px;
+    margin: 4px 3px;
+    border-radius: 15px;
+    border: 0px;
+    color: @textcolor1;
+    background-color: @workspacesbackground2;
+    transition: all 0.3s ease-in-out;
+    opacity: 0.4;
+}
+
+#workspaces button.active {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    min-width: 40px;
+    transition: all 0.3s ease-in-out;
+    opacity:1.0;
+}
+
+#workspaces button:hover {
+    color: @textcolor1;
+    background: @workspacesbackground2;
+    border-radius: 15px;
+    opacity:0.7;
+}
+
+/* -----------------------------------------------------
+ * Tooltips
+ * ----------------------------------------------------- */
+
+tooltip {
+    border-radius: 10px;
+    background-color: @backgroundlight;
+    opacity:0.8;
+    padding:20px;
+    margin:0px;
+}
+
+tooltip label {
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Window
+ * ----------------------------------------------------- */
+
+#window {
+    background: @backgroundlight;
+    margin: 6px 15px 6px 0px;
+    padding: 0px 10px 0px 10px;
+    border-radius: 15px;
+    color:@textcolor2;
+    font-size:16px;
+    font-weight:normal;
+    opacity:0.8;
+}
+
+window#waybar.empty #window {
+    background-color:transparent;
+}
+
+/* -----------------------------------------------------
+ * Taskbar
+ * ----------------------------------------------------- */
+
+#taskbar {
+    background: @backgroundlight;
+    margin: 6px 10px 6px 0px;
+    padding:0px;
+    border-radius: 15px;
+    font-weight: normal;
+    font-style: normal;
+    opacity:0.8;
+    border: 3px solid @backgroundlight;
+}
+
+#taskbar button {
+    margin:0;
+    border-radius: 15px;
+    padding: 0px 5px 0px 5px;
+}
+
+
+/* -----------------------------------------------------
+ * Custom Quicklinks
+ * ----------------------------------------------------- */
+
+#custom-brave, 
+#custom-browser, 
+#custom-keybindings, 
+#custom-outlook, 
+#custom-filemanager, 
+#custom-teams, 
+#custom-chatgpt, 
+#custom-calculator, 
+#custom-windowsvm, 
+#custom-cliphist, 
+#custom-wallpaper, 
+#custom-settings, 
+#custom-wallpaper, 
+#custom-system,
+#custom-waybarthemes {
+    margin-right: 23px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+ 
+#custom-system {
+    margin-right:15px;
+}
+
+#custom-wallpaper {
+    margin-right:25px;
+}
+
+#custom-waybarthemes, #custom-settings {
+    margin-right:20px;
+}
+
+#custom-ml4w-welcome {
+    margin-right: 15px;
+    background-image: url("../assets/ml4w-icon.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+#custom-chatgpt {
+    margin-right: 15px;
+    background-image: url("../assets/ai-icon-20.png");
+    background-repeat: no-repeat;
+    background-position: center;
+    padding-right: 24px;
+}
+
+/* -----------------------------------------------------
+ * Idle Inhibator
+ * ----------------------------------------------------- */
+
+#idle_inhibitor {
+    margin-right: 10px;
+    font-size: 22px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: @iconcolor;
+}
+
+#idle_inhibitor.activated {
+    margin-right: 10px;
+    font-size: 20px;
+    font-weight: bold;
+    opacity: 0.8;
+    color: #dc2f2f;
+}
+
+/* -----------------------------------------------------
+ * Custom Modules
+ * ----------------------------------------------------- */
+
+#custom-appmenu, #custom-appmenuicon {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 0px 10px 0px 10px;
+    margin: 6px 10px 6px 10px;
+    opacity:0.8;
+    border:3px solid @bordercolor;
+}
+
+#custom-appmenuicon {
+    padding-right: 12px;
+    padding-left: 8px;
+}
+
+/* -----------------------------------------------------
+ * Custom Exit
+ * ----------------------------------------------------- */
+
+#custom-exit {
+    margin: 0px 15px 0px 0px;
+    padding:0px;
+    font-size:20px;
+    color: @iconcolor;
+}
+
+/* -----------------------------------------------------
+ * Custom Updates
+ * ----------------------------------------------------- */
+
+#custom-updates {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#custom-updates.green {
+    background-color: @backgroundlight;
+}
+
+#custom-updates.yellow {
+    background-color: #ff9a3c;
+    color: #FFFFFF;
+}
+
+#custom-updates.red {
+    background-color: #dc2f2f;
+    color: #FFFFFF;
+}
+
+/* -----------------------------------------------------
+ * Custom Youtube
+ * ----------------------------------------------------- */
+
+#custom-youtube {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 15px 8px 0px;
+    opacity:0.8;
+}
+
+/* -----------------------------------------------------
+ * Hardware Group
+ * ----------------------------------------------------- */
+
+ #disk,#memory,#cpu,#language {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#language {
+    margin-right:10px;
+}
+
+/* -----------------------------------------------------
+ * Clock
+ * ----------------------------------------------------- */
+
+#clock {
+    background-color: @backgrounddark;
+    font-size: 16px;
+    color: @textcolor1;
+    border-radius: 15px;
+    padding: 1px 10px 0px 10px;
+    margin: 6px 10px 6px 0px;
+    opacity:0.8;
+    border:3px solid @bordercolor;   
+}
+
+/* -----------------------------------------------------
+ * Pulseaudio
+ * ----------------------------------------------------- */
+
+#pulseaudio {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#pulseaudio.muted {
+    background-color: @backgrounddark;
+    color: @textcolor1;
+}
+
+/* -----------------------------------------------------
+ * Network
+ * ----------------------------------------------------- */
+
+#network {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#network.ethernet {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+#network.wifi {
+    background-color: @backgroundlight;
+    color: @textcolor2;
+}
+
+/* -----------------------------------------------------
+ * Bluetooth
+ * ----------------------------------------------------- */
+
+ #bluetooth, #bluetooth.on, #bluetooth.connected {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#bluetooth.off {
+    background-color: transparent;
+    padding: 0px;
+    margin: 0px;
+}
+
+/* -----------------------------------------------------
+ * Battery
+ * ----------------------------------------------------- */
+
+#battery {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 15px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
+
+#battery.charging, #battery.plugged {
+    color: @textcolor2;
+    background-color: @backgroundlight;
+}
+
+@keyframes blink {
+    to {
+        background-color: @backgroundlight;
+        color: @textcolor2;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: @textcolor3;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+/* -----------------------------------------------------
+ * Tray
+ * ----------------------------------------------------- */
+
+#tray {
+    padding: 0px 10px 0px 0px;
+    color: @textcolor3;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+}
@@ -20,9 +20,5 @@ window#waybar {
 }

 #custom-ml4w-welcome {
-    background-image: url("../../assets/ml4w-icon-black.svg");
-}
-
-#custom-chatgpt {
-    background-image: url("../../assets/openai-black.svg");
+    background-image: url("../../assets/ml4w-icon-dark.png");
 }
@@ -19,10 +19,7 @@
    "spacing": 0,

    // Load Modules
-    "include": [
-        "~/dotfiles/.settings/waybar-quicklinks.json",
-        "~/dotfiles/waybar/modules.json"
-    ],
+    "include": ["~/dotfiles/waybar/modules.json"],

    // Modules Left
    "modules-left": [
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wyj	c2d2d45546	Merge branch 'upstream-main' into fcitx5	2024-06-05 05:50:50 -04:00
wyj	b9025fbfb1	fix: fcitx5 conf	2024-04-05 16:13:19 -04:00
wyj	7a4d9f7b21	fix: fcitx5 conf	2024-04-05 16:07:36 -04:00
wyj	249e71d187	fix: fcitx5 conf	2024-04-05 15:50:00 -04:00
wyj	380b43ea30	new feat: fcitx5 install	2024-04-05 15:31:21 -04:00
wyj	ee983e39db	update: waybar tray	2024-04-05 02:59:46 -04:00
wyj	18bed6fbdf	update: rofi border-radius and position etc	2024-04-05 01:33:45 -04:00
wyj	77cd4cf980	minor: space in cpu module in waybar	2024-04-04 05:10:16 -04:00
wyj	f095151882	update: better cpu icon in waybar	2024-04-04 04:52:18 -04:00
wyj	bc227bed49	minor: trail space	2024-04-04 04:44:25 -04:00
wyj	475fbc55cc	update: better battery in waybar	2024-04-04 04:42:52 -04:00
wyj	1c96f24b09	update: new battary icons in waybar	2024-04-04 03:17:29 -04:00
wyj	71caefa11a	update: rm volume number from waybar	2024-04-04 02:29:48 -04:00
wyj	4b9812dc7f	update: add notify-sent to volume change	2024-04-04 00:02:50 -04:00
wyj	20ce47fa20	update: add ~/.local/bin to PATH in bashrc (for zathura-pywal)	2024-04-03 22:27:27 -04:00
wyj	1763d37ee4	update: keep memory in waybar 0.1f	2024-04-03 17:31:32 -04:00
wyj	b113e1f81d	update: keep idle-inh...	2024-04-03 14:34:31 -04:00
wyj	289308a542	update: keep idle-inh...	2024-04-03 14:29:05 -04:00
wyj	8c2be8fed6	Merge remote-tracking branch 'upstream/main' into upstream-custom	2024-04-03 14:22:56 -04:00
wyj	beb717a961	update: custom waybar	2024-04-03 13:25:27 -04:00
wyj	2e985927af	update: add custom blur waybar themes	2024-03-28 19:30:14 -04:00
wyj	8265c9fdea	update: add custom waybar themes	2024-03-28 19:26:19 -04:00
wyj	c1873060de	update: add custom settings	2024-03-28 13:02:10 -04:00
@@ -1 +1 @@
 .9.2
 .9.1.1