diff --git a/new-config/.bashrc b/new-config/.bashrc
index 8969a10ca..ee023372d 100644
--- a/new-config/.bashrc
+++ b/new-config/.bashrc
@@ -6,10 +6,10 @@
 ##
 
 ### EXPORT ###
-export TERM="xterm-256color"                                                      # getting proper colors
-export HISTCONTROL=ignoredups:erasedups                                           # no duplicate entries
-export EDITOR="$HOME/.local/bin/lvim"                                             # $EDITOR use Lunarvim in terminal
-export VISUAL="wezterm start --class editor -- $HOME/.local/bin/lvim"           # $VISUAL use Lunarvim in new wezterm window
+export TERM="xterm-256color"                                           # getting proper colors
+export HISTCONTROL=ignoredups:erasedups                                # no duplicate entries
+export EDITOR="$HOME/.local/bin/lvim"                                  # $EDITOR use Lunarvim in terminal
+export VISUAL="wezterm start --class editor -- $HOME/.local/bin/lvim"  # $VISUAL use Lunarvim in new wezterm window
 
 ### "bat" as manpager
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
diff --git a/new-config/.config/hypr/hyprland.conf b/new-config/.config/hypr/hyprland.conf
index 5508ee27a..845084c9c 100644
--- a/new-config/.config/hypr/hyprland.conf
+++ b/new-config/.config/hypr/hyprland.conf
@@ -1,18 +1,42 @@
-# Autostart
+############################################################
+###      ____             __                             ###
+###     / __ \_________ _/ /_____                        ###
+###    / / / / ___/ __ `/ //_/ _ \                       ###
+###   / /_/ / /  / /_/ / ,< /  __/  Clay Gomera (Drake)  ###
+###  /_____/_/   \__,_/_/|_|\___/   The Hyprland config  ###
+###                                                      ###
+############################################################
+
+################################
+### beg_________  ___  ____  ###
+###   / ___/ __ \/ _ \/ __/  ###
+###  / /__/ /_/ / , _/ _/    ###
+###  \___/\____/_/|_/___/    ###
+###                          ###
+############# {{{{ #############
+
+# AUTOSTART
+## Wayland backend
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+## Polkit agent
 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
+## Desktop portals
 exec-once = /usr/lib/xdg-desktop-portal
 exec-once = /usr/lib/xdg-desktop-portal-hyprland
+## Notification daemon
 exec-once = dunst --config ~/.config/dunst/dunstrc
-exec-once = $HOME/.wbg
-exec-once = wl-paste --type text --watch cliphist store #Stores only text data
-exec-once = wl-paste --type image --watch cliphist store #Stores only image data
+## Top bar
 exec-once = waybar
+## Set wallpaper
+exec-once = $HOME/.wbg
+## Clipboard history
+exec-once = wl-paste --type text --watch cliphist store  #Stores only text data
+exec-once = wl-paste --type image --watch cliphist store #Stores only image data
 
-# Monitors
+# MONITORS
 monitor=,preferred,auto,1
 
-# Input
+# INPUT
 input {
   kb_layout = us,es
   kb_options = grp:shift_caps_toggle 
@@ -23,7 +47,7 @@ input {
   sensitivity = -0.2 # -1.0 - 1.0, 0 means no modification.
 }
 
-# General
+# GENERAL
 general {
   gaps_in = 5
   gaps_out = 10
@@ -33,10 +57,10 @@ general {
   layout = master
 }
 
-# Decorations
+# DECORATIONS
 decoration {
-  rounding = 4
-  blur = yes
+  rounding = 4 # Rounded corners
+  blur = yes # Window background blur
   blur_size = 4
   blur_passes = 1.5
   blur_new_optimizations = no
@@ -46,7 +70,7 @@ decoration {
   col.shadow = rgba(1a1a1aee)
 }
 
-# Animations
+# ANIMATIONS
 animations {
   enabled = yes
   bezier = myBezier, 0.05, 0.9, 0.1, 1.05
@@ -60,25 +84,25 @@ animations {
   animation = workspaces, 1, 5, default, slide
 }
 
-# Dwindle layout config
+# DWINDLE LAYOUT CONFIG
 dwindle {
   pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
   preserve_split = yes # you probably want this
 }
 
-# Master layout config
+# MASTER LAYOUT CONFIG
 master {
   no_gaps_when_only = false
   new_is_master = false
   mfact = 0.50
 }
 
-# Mouse gestures
+# TOUCHPAD GESTURES
 gestures {
   workspace_swipe = on
 }
 
-# Misc
+# MISC
 misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
@@ -87,12 +111,30 @@ misc {
   swallow_regex = ^(wezterm)$
 }
 
+# MOUSE SENSITIVITY
 device:epic mouse V1 {
   sensitivity = -0.5
 }
 
-# Window rules
+################################
+### end_________  ___  ____  ###
+###   / ___/ __ \/ _ \/ __/  ###
+###  / /__/ /_/ / , _/ _/    ###
+###  \___/\____/_/|_/___/    ###
+###                          ###
+############# }}}} #############
+
+###################################
+### beg___  __  ____   ________ ###
+###   / _ \/ / / / /  / __/ __/ ###
+###  / , _/ /_/ / /__/ _/_\ \   ###
+### /_/|_|\____/____/___/___/   ###
+###                             ###
+############## {{{{ ###############
+
+# WINDOW RULES
 windowrule = float, ^(qalculate-gtk)$
+## Workspace 1 - Web
 windowrule = workspace 1, ^(org.qutebrowser.qutebrowser)$
 windowrule = workspace 1, ^(newsboat)$
 windowrule = workspace 1, ^(firefox)$
@@ -100,14 +142,19 @@ windowrule = workspace 1, ^(Librewolf)$
 windowrule = workspace 1, ^(Chromium)$
 windowrule = workspace 1, ^(Brave-browser)$
 windowrule = workspace 1, ^(tut)$
+## Workspace 2 - File management
 windowrule = workspace 2, ^(file_manager)$
 windowrule = workspace 2, ^(Pcmanfm)$
+## Workspace 3 - Editors
 windowrule = workspace 3, ^(text_editor)$
+windowrule = workspace 3, ^(Code)$
+## Workspace 4 - Chat
 windowrule = workspace 4, ^(chat_client)$
 windowrule = workspace 4, ^(whatsapp-for-linux)$
 windowrule = workspace 4, ^(Element)$
 windowrule = workspace 4, ^(Signal)$
 windowrule = workspace 4, ^(revolt-desktop)$
+## Workspace 5 - Audio
 windowrule = workspace 5, ^(music_player)$
 windowrule = workspace 5, ^(ytfzf_music)$
 windowrule = workspace 5, ^(audacity)$
@@ -121,6 +168,7 @@ windowrule = workspace 5, ^(QjackCtl)$
 windowrule = workspace 5, ^(org.rncbc.qpwgraph)$
 windowrule = workspace 5, ^(soundconverter)$
 windowrule = workspace 5, ^(kid3-qt)$
+## Workspace 6 - Video
 windowrule = workspace 6, ^(pitivi)$
 windowrule = workspace 6, ^(org.kde.kdenlive)$
 windowrule = workspace 6, ^(mpv)$
@@ -130,10 +178,12 @@ windowrule = workspace 6, ^(ani_cli)$
 windowrule = workspace 6, ^(blender)$
 windowrule = workspace 6, ^(com.obsproject.Studio)$
 windowrule = workspace 6, ^(fr.handbrake.ghb)$
+## Workspace 7 - Graphics
 windowrule = workspace 7, ^(org.inkscape.Inkscape)$
 windowrule = workspace 7, ^(Gimp-2.10)$
 windowrule = workspace 7, ^(xournalpp)$
 windowrule = workspace 7, ^(krita)$
+## Workspace 8 - Office
 windowrule = workspace 8, ^(libreoffice-writer)$
 windowrule = workspace 8, ^(libreoffice-calc)$
 windowrule = workspace 8, ^(libreoffice-impress)$
@@ -142,11 +192,13 @@ windowrule = workspace 8, ^(libreoffice-draw)$
 windowrule = workspace 8, ^(libreoffice-math)$
 windowrule = workspace 8, ^(soffice)$
 windowrule = workspace 8, ^(GeoGebra)$
+## Workspace 9 - Games
 windowrule = workspace 9, ^(org.libretro.RetroArch)$
 windowrule = workspace 9, ^(DarkPlaces)$
 windowrule = workspace 9, ^(pyrogenesis)$
 windowrule = workspace 9, ^(wesnoth)$
 windowrule = workspace 9, ^(Minetest)$
+## Workspace 10 - Extras
 windowrule = workspace 10, ^(btop)$
 windowrule = workspace 10, ^(htop)$
 windowrule = workspace 10, ^(pulsemixer)$
@@ -157,41 +209,66 @@ windowrule = workspace 10, ^(font-manager)$
 windowrule = workspace 10, ^(org.qbittorrent.qBittorrent)$
 windowrule = workspace 10, ^(org.keepassxc.KeePassXC)$
 
+###################################
+### end___  __  ____   ________ ###
+###   / _ \/ / / / /  / __/ __/ ###
+###  / , _/ /_/ / /__/ _/_\ \   ###
+### /_/|_|\____/____/___/___/   ###
+###                             ###
+############## }}}} ###############
+
+##################################
+### beg___  _____  _____  ____ ###
+###   / _ )/  _/ |/ / _ \/ __/ ###
+###  / _  |/ //    / // /\ \   ###
+### /____/___/_/|_/____/___/   ###
+###                            ###
+############## {{{{ ##############
+
+# MODIFIER KEYS VARIABLES
 $supMod = SUPER
 $altMod = ALT
 $conMod = CONTROL
 
-bind = $supMod, RETURN, exec, wezterm
-bind = $supMod, Q, killactive, 
-bind = $supMod_$conMod_SHIFT, Q, exit, 
-bind = $supMod, B, exec, pkill waybar || waybar
-bind = $supMod, V, togglefloating, 
-bind = $supMod, P, pseudo, # dwindle
-bind = $supMod, J, togglesplit, # dwindle
+# MAIN KEYBINDS
+bind = $supMod,               RETURN, exec, wezterm                  # Terminal
+bind = $supMod,               q,      killactive,                    # Close window
+bind = $supMod_$conMod_SHIFT, q,      exit,                          # Exit the compositor
+bind = $supMod,               b,      exec, pkill waybar || waybar   # Hide/Show the top bar
+bind = $supMod,               v,      togglefloating,                # Toggle floating mode
+#bind = $supMod, P, pseudo, # dwindle
+#bind = $supMod, J, togglesplit, # dwindle
 
-# Move focus with supMod + arrow keys
+# FOCUS
+## Cycle focus with supmod + k,j
 bind = $supMod, k, layoutmsg, cyclenext
 bind = $supMod, j, layoutmsg, cycleprev
-
-# swap windows
-bind = $supMod_SHIFT, j, layoutmsg, swapnext
-bind = $supMod_SHIFT, k, layoutmsg, swapprev
-
-# focus master window
+## Focus master window
 bind = $supMod_SHIFT, RETURN, layoutmsg, focusmaster
 
-# swap window with master
+# LAYOUT MANIPULATION
+## Swap windows
+bind = $supMod_SHIFT, j, layoutmsg, swapnext
+bind = $supMod_SHIFT, k, layoutmsg, swapprev
+## Swap window with master
 bind = $supMod_$conMod, RETURN, layoutmsg, swapwithmaster
-
-# add window to master stack
+## Add/remove window to master stack
 bind = $supMod, I, layoutmsg, addmaster
 bind = $supMod, D, layoutmsg, removemaster
+## Change the master orientation
+bind = $supMod_SHIFT, l, layoutmsg, orientationnext
+bind = $supMod_SHIFT, h, layoutmsg, orientationprev
+## Window resizing
+bind = $supMod_$conMod, l, resizeactive, 30 0
+bind = $supMod_$conMod, h, resizeactive, -30 0
+bind = $supMod_$conMod, j, resizeactive, 0 30
+bind = $supMod_$conMod, k, resizeactive, 0 -30
+# Move/resize windows with supmod + lmb/rmb and dragging
+bindm = $supMod, mouse:272, movewindow
+bindm = $supMod, mouse:273, resizewindow
 
-# change the master orientation
-bind = $supMod, l, layoutmsg, orientationnext
-bind = $supMod, h, layoutmsg, orientationprev
-
-# Switch workspaces with supMod + [0-9]
+# WORKSPACES MANIPULATION
+## Switch workspaces with supmod + [0-9]
 bind = $supMod, 1, workspace, 1
 bind = $supMod, 2, workspace, 2
 bind = $supMod, 3, workspace, 3
@@ -202,8 +279,7 @@ bind = $supMod, 7, workspace, 7
 bind = $supMod, 8, workspace, 8
 bind = $supMod, 9, workspace, 9
 bind = $supMod, 0, workspace, 10
-
-# Move active window to a workspace with supMod + SHIFT + [0-9]
+## Move active window to a workspace with supmod + shift + [0-9]
 bind = $supMod_SHIFT, 1, movetoworkspace, 1
 bind = $supMod_SHIFT, 2, movetoworkspace, 2
 bind = $supMod_SHIFT, 3, movetoworkspace, 3
@@ -214,74 +290,87 @@ bind = $supMod_SHIFT, 7, movetoworkspace, 7
 bind = $supMod_SHIFT, 8, movetoworkspace, 8
 bind = $supMod_SHIFT, 9, movetoworkspace, 9
 bind = $supMod_SHIFT, 0, movetoworkspace, 10
-
-# Scroll through existing workspaces with supMod + scroll
+## Scroll through existing workspaces with supmod + scroll
 bind = $supMod, mouse_down, workspace, e+1
 bind = $supMod, mouse_up, workspace, e-1
-
-# Scroll through existing workspaces with supMod + arrow keys
-bind = $supMod, Left, workspace, e+1
-bind = $supMod, Right, workspace, e-1
-
-# Move active window through existing workspaces with supMod + arrow keys
+# Scroll through existing workspaces with supmod + arrow keys
+bind = $supMod, Right, workspace, e+1
+bind = $supMod, Left, workspace, e-1
+## Move active window through existing workspaces with supmod + arrow keys
 bind = $supMod_SHIFT, Left, movetoworkspace, e+1
 bind = $supMod_SHIFT, Right, movetoworkspace, e-1
 
-# Move/resize windows with supMod + LMB/RMB and dragging
-bindm = $supMod, mouse:272, movewindow
-bindm = $supMod, mouse:273, resizewindow
+# XF86 KEYS
+## Media control
+bindl=, XF86AudioRaiseVolume,  exec, pamixer -i 5                # Increase volume by 5%
+bindl=, XF86AudioLowerVolume,  exec, pamixer -d 5                # Decrease volume by 5%
+bindl=, XF86AudioMute,         exec, pamixer -t                  # Toggle mute
+bindl=, XF86AudioMicMute,      exec, pamixer --default-source -t # Toggle microphone mute
+bindl=, XF86AudioPause,        exec, playerctl play-pause        # Play/pause
+bindl=, XF86AudioPlay,         exec, playerctl play-pause        # Play/pause
+bindl=, XF86AudioNext,         exec, playerctl next              # Next song
+bindl=, XF86AudioPrev,         exec, playerctl previous          # Previous song
+bindl=, XF86AudioStop,         exec, playerctl stop              # Stop playback
+## News
+bindl=, XF86News,              exec, wezterm start --class newsboat -- newsboat
+## Brightness control
+bindl=, XF86MonBrightnessUp,   exec, brightnessctl s 10%+        # Increase brightness by 10%
+bindl=, XF86MonBrightnessDown, exec, brightnessctl s 10%-        # Decrease brightness by 10%
+## Display setup
+bindl=, XF86Display,           exec, wdisplays                   # Open the display config tool (wdisplays)
 
-# Audio control
-bindl=, XF86AudioRaiseVolume, exec, pamixer -i 5
-bindl=, XF86AudioLowerVolume, exec, pamixer -d 5
-bindl=, XF86AudioMute, exec, pamixer -t
-bindl=, XF86AudioMicMute, exec, pamixer --default-source -t
-bindl=, XF86AudioPause, exec, playerctl play-pause
-bindl=, XF86AudioPlay, exec, playerctl play-pause
-bindl=, XF86AudioNext, exec, playerctl next
-bindl=, XF86AudioPrev, exec, playerctl previous
-bindl=, XF86AudioStop, exec, playerctl stop
-bindl=, XF86News, exec, wezterm start --class newsboat -- newsboat
+# ROFI
+binde = $supMod_SHIFT,   d, exec, pkill rofi || rofi -show drun                              # Desktop launcher
+binde = $supMod_SHIFT,   r, exec, pkill rofi || rofi -show run                               # Standard launcher
+binde = $supMod_SHIFT,   w, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_wall         # Wallpaper setup
+binde = $supMod_SHIFT,   i, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_wifi         # Wifi setup
+binde = $supMod_SHIFT,   e, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_emoji        # Emoji picker
+binde = $supMod_SHIFT,   s, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_scrot        # Screenshot tool
+binde = $supMod_$conMod, s, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_scrot -s     # Stop recording (for the screenshot tool)
+binde = $supMod_SHIFT,   q, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_power        # Power setup
+binde = $supMod_SHIFT,   b, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_blue         # Bluetooth setup
+binde = $supMod_SHIFT,   c, exec, pkill rofi || cliphist list | rofi -dmenu -p "   Clipboard " | cliphist decode | wl-copy # Clipboard history
 
-# Brightness control
-bindl=, XF86MonBrightnessUp, exec, brightnessctl s 10%+
-bindl=, XF86MonBrightnessDown, exec, brightnessctl s 10%-
+# COLOR PICKER
+binde = $supMod_$conMod, c, exec, hyprpicker -n -a
 
-# Display configuration
-bindl=, XF86Display, exec, wdisplays
+# QUICK TERMINAL SCRIPTS/COMMANDS
+## Workspace 1 - Web
+binde = $supMod_$altMod, t, exec, wezterm start --class tut -- tut                        # Mastodon client
+binde = $supMod_$altMod, r, exec, wezterm start --class newsboat -- newsboat              # RSS feed reader
+## Workspace 5 - Audio
+binde = $supMod_$altMod, m, exec, wezterm start --class ytfzf_music -- ytfzf -mlstT chafa # Listen to YouTube Music on the terminal
+## Workspace 6 - Video
+binde = $supMod_$altMod, f, exec, wezterm start --class flix_cli -- flix-cli              # Watch movies on the terminal
+binde = $supMod_$altMod, a, exec, wezterm start --class ani_cli -- ani-cli                # Watch anime on the terminal
+binde = $supMod_$altMod, y, exec, wezterm start --class ytfzf -- ytfzf -flstT chafa       # Watch YouTube on the terminal
+## Workspace 10 - Extras
+binde = $supMod_$altMod, g, exec, wezterm start --class geek-life -- geek-life            # Todo manager
+binde = $supMod_$altMod, p, exec, wezterm start --class pulsemixer -- pulsemixer          # Open the volume mixer (pulsemixer)
+binde = $supMod_$altMod, o, exec, wezterm start --class alsamixer -- alsamixer            # Open the volume mixer (alsamixer)
+binde = $supMod_$altMod, b, exec, wezterm start --class btop -- btop                      # Open the system monitor (btop)
+binde = $supMod_$altMod, h, exec, wezterm start --class htop -- htop                      # Open the system monitor (htop)
 
-# Rofi menus
-binde = $supMod_SHIFT, D, exec, pkill rofi || rofi -show drun
-binde = $supMod_SHIFT, W, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_wall
-binde = $supMod_SHIFT, I, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_wifi
-binde = $supMod_SHIFT, E, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_emoji
-binde = $supMod_SHIFT, S, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_scrot
-binde = $supMod_$conMod, S, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_scrot -s
-binde = $supMod_SHIFT, Q, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_power
-binde = $supMod_SHIFT, B, exec, pkill rofi || $HOME/.config/rofi/scripts/rofi_blue
-binde = $supMod_SHIFT, C, exec, pkill rofi || cliphist list | rofi -dmenu -p "   Clipboard " | cliphist decode | wl-copy
+# MAIN APPS
+## Workspace 1 - Web
+binde = $supMod, w, exec, brave
+## Workspace 2 - File management
+binde = $supMod, f, exec, wezterm start --class file_manager -- vifm
+## Workspace 3 - Editors
+binde = $supMod, e, exec, wezterm start --class text_editor -- "$HOME/.local/bin/lvim"
+## Workspace 4 - Chat
+binde = $supMod, c, exec, wezterm start --class chat_client -- gomuks
+## Workspace 5 - Audio
+binde = $supMod, m, exec, wezterm start --class music_player -- cmus
+## Workspace 9 - Games
+binde = $supMod, g, exec, retroarch
+## Workspace 10 - Extras
+binde = $supMod, p, exec, keepassxc
 
-# color picker
-binde = $supMod_$conMod, C, exec, hyprpicker -n -a
-
-# Quick terminal scripts/commands
-binde = $supMod_$altMod, T, exec, wezterm start --class tut -- tut
-binde = $supMod_$altMod, F, exec, wezterm start --class flix_cli -- flix-cli
-binde = $supMod_$altMod, A, exec, wezterm start --class ani_cli -- ani-cli
-binde = $supMod_$altMod, Y, exec, wezterm start --class ytfzf -- ytfzf -flstT chafa
-binde = $supMod_$altMod, M, exec, wezterm start --class ytfzf_music -- ytfzf -mlstT chafa
-binde = $supMod_$altMod, P, exec, wezterm start --class pulsemixer -- pulsemixer
-binde = $supMod_$altMod, O, exec, wezterm start --class alsamixer -- alsamixer
-binde = $supMod_$altMod, G, exec, wezterm start --class geek-life -- geek-life
-binde = $supMod_$altMod, R, exec, wezterm start --class newsboat -- newsboat
-binde = $supMod_$altMod, B, exec, wezterm start --class btop -- btop
-binde = $supMod_$altMod, H, exec, wezterm start --class htop -- htop
-
-# Apps
-binde = $supMod, E, exec, wezterm start --class text_editor -- "$HOME/.local/bin/lvim"
-binde = $supMod, W, exec, brave
-binde = $supMod, F, exec, wezterm start --class file_manager -- vifm
-binde = $supMod, M, exec, wezterm start --class music_player -- cmus
-binde = $supMod, C, exec, wezterm start --class chat_client -- gomuks
-binde = $supMod, P, exec, keepassxc
-binde = $supMod, G, exec, retroarch
+##################################
+### end___  _____  _____  ____ ###
+###   / _ )/  _/ |/ / _ \/ __/ ###
+###  / _  |/ //    / // /\ \   ###
+### /____/___/_/|_/____/___/   ###
+###                            ###
+############## {{{{ ##############
diff --git a/new-config/.config/waybar/config b/new-config/.config/waybar/config
index a0ab7d9f1..f5e59a76b 100644
--- a/new-config/.config/waybar/config
+++ b/new-config/.config/waybar/config
@@ -25,14 +25,14 @@
        "8": "\udb80\ude19",
        "9": "\udb80\ude96",
        "10": "\udb80\udf7b",
-       "urgent": "",
-       "focused": "",
-       "default": ""
+       "urgent": "\udb80\udc26",
+       "focused": "\udb83\udeff",
+       "default": "\udb80\udc94"
     }
   },
 
   "hyprland/language": {
-    "format": "{}  ",
+    "format": "{} \udb80\udf0c",
     "format-en": "US",
     "format-es": "ES",
     "keyboard-name": "at-translated-set-2-keyboard",
@@ -42,20 +42,20 @@
   "idle_inhibitor": {
     "format": "{icon}",
     "format-icons": {
-      "activated": "⏽",
-      "deactivated": "󰤄"
+      "activated": "\udb83\udf62",
+      "deactivated": "\udb83\udf64"
     }
   },
 
   "clock": {
     "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-    "format": "󰥔 {:%H:%M}",
-    "format-alt": " {:%Y-%m-%d}"
+    "format": "\udb82\udd54 {:%H:%M}",
+    "format-alt": "\udb80\udcf5 {:%Y-%m-%d}"
   },
 
   "backlight": {
     "format": "{percent}% {icon}",
-    "format-icons": ["󱠃", "󱠃", "󱠃", "󱠃", "󱠃", "󱠂", "󱠂", "󱠂", "󱠂"]
+    "format-icons": ["\udb86\ude4e", "\udb86\ude4f", "\udb86\ude50", "\udb86\ude51", "\udb86\ude52", "\udb86\ude53", "\udb86\ude54", "\udb86\ude55", "\udb81\udee8"]
   },
 
   "battery": {
@@ -64,12 +64,12 @@
       "critical": 15
     },
     "format": "{capacity}% {icon}",
-    "format-charging": "{capacity}% 󱐋",
-    "format-plugged": "{capacity}% 󰚥",
+    "format-charging": "{capacity}% {icon}\udb81\udea5",
+    "format-plugged": "{capacity}% {icon}\udb81\udea5",
     "format-alt": "{time} {icon}",
-    "format-critical": "{capacity}% {icon} ",
-    "format-warning": "{capacity}% {icon} ",
-    "format-icons": [" ", " ", " ", " ", " "]
+    "format-critical": "{capacity}% {icon}\udb84\ude38",
+    "format-warning": "{capacity}% {icon}\udb84\ude38",
+    "format-icons": ["\udb80\udc7a", "\udb80\udc7c", "\udb80\udc7e", "\udb80\udc80", "\udb80\udc79"]
   },
 
   "custom/powerprofiles": {
@@ -81,28 +81,28 @@
   "pulseaudio": {
     "scroll-step": 1, // %, can be a float
     "format": "{volume}% {icon} {format_source}",
-    "format-bluetooth": "{volume}% {icon}  {format_source}",
-    "format-bluetooth-muted": "󰖁 {icon}  {format_source}",
-    "format-muted": "󰖁 {format_source}",
-    "format-source": "{volume}% 󰍬",
-    "format-source-muted": "󰍭",
+    "format-bluetooth": "{volume}% {icon}\udb80\udcaf {format_source}",
+    "format-bluetooth-muted": "\udb81\udd81 {icon}\udb80\udcaf {format_source}",
+    "format-muted": "\udb81\udd81 {format_source}",
+    "format-source": "{volume}% \udb80\udf6c",
+    "format-source-muted": "\udb80\udf6d",
     "format-icons": {
-      "headphone": "󰋋",
-      "hands-free": "󱡏",
-      "headset": "󰋎",
-      "phone": "󰏲",
-      "portable": "󰏲",
-      "car": "󰄋",
-      "default": ["󰕿", "󰖀", "󰕾"]
+      "headphone": "\udb80\udecb",
+      "hands-free": "\udb86\udc4f",
+      "headset": "\udb80\udece",
+      "phone": "\udb80\udff2",
+      "portable": "\udb80\udff2",
+      "car": "\udb80\udd0b",
+      "default": ["\udb81\udd7f", "\udb81\udd80", "\udb81\udd7e"]
     },
-    "on-click": "wezterm start -- pulsemixer"
+    "on-click": "wezterm start --class pulsemixer -- pulsemixer"
   },
 
   "network": {
     // "interface": "wlp2*", // (Optional) To force the use of this interface
-    "format-wifi": "{essid} 󱚻 ",
-    "format-ethernet": "{ipaddr}/{cidr} 󰈀 ",
-    "format-disconnected": "Disconnected 󱛅 ",
+    "format-wifi": "{essid} \udb81\udda9",
+    "format-ethernet": "{ipaddr}/{cidr} \udb80\ude00",
+    "format-disconnected": "Disconnected \udb81\uddaa",
     "format-alt": "{ifname}: {ipaddr}/{cidr}"
   },
 }
diff --git a/new-config/.config/waybar/power-profiles b/new-config/.config/waybar/power-profiles
index df29a3866..35f9dc126 100755
--- a/new-config/.config/waybar/power-profiles
+++ b/new-config/.config/waybar/power-profiles
@@ -1,10 +1,10 @@
 #!/bin/bash
 currntpwr=$(powerprofilesctl get)
 if [ "${currntpwr}" = "performance" ]; then
-  pwr="󰓅 Performance"
+  pwr="Performance 󰓅"
 elif [ "${currntpwr}" = "balanced" ]; then
-  pwr="󰾅 Balanced"
+  pwr="Balanced 󰾅"
 elif [ "${currntpwr}" = "power-saver" ]; then
-  pwr="󰾆 PowerSaver"
+  pwr="PowerSaver 󰾆"
 fi
 echo "$pwr"
diff --git a/new-config/.config/waybar/style.css b/new-config/.config/waybar/style.css
index 6fa4851c5..59d18dadc 100644
--- a/new-config/.config/waybar/style.css
+++ b/new-config/.config/waybar/style.css
@@ -46,7 +46,7 @@ button:hover {
 }
 
 #workspaces button {
-    padding: 0 5px;
+    padding: 0 3px;
     background-color: transparent;
     color: #ebdbb2;
     border-radius: 5px;
@@ -89,9 +89,9 @@ button:hover {
 #language,
 #mode,
 #idle_inhibitor {
-    font-family: mononoki Nerd Font;
+    font-family: Symbols Nerd Font Mono, mononoki Nerd Font;
     font-size: 16px;
-    padding: 0 10px;
+    padding: 0 8px;
     color: #ffffff;
 }
 
diff --git a/new-config/dependencies.md b/new-config/dependencies.md
index 6b8c9a109..f85d0e369 100644
--- a/new-config/dependencies.md
+++ b/new-config/dependencies.md
@@ -1,32 +1,31 @@
 # Dependencies
-- mononoki nerd Font
+- ttf-mononoki-nerd
 - rofi-lboon-wayland-git
 - waybar
 - swaybg
 - dunst
 - xdg-desktop-portal
-- xdg-desktop-portal-wlr
+- xdg-desktop-portal-hyprland
 - polkit-gnome
-- qt5-wayland & qt6-wayland
+- qt5-wayland
+- qt6-wayland
 - swaylock
 - slurp
 - grim
 - wl-clipboard
 - wf-recorder
 - wezterm
-- hyprland
+- hyprland-bin
 - hyprpicker-git
 - cmus
-- flix-cli
-- tut
-- ani-cli
-- ytfzf
+- tut-bin
+- ani-cli-git
+- ytfzf-git
 - mpv
 - newsboat
 - pulsemixer
 - alsamixer
 - vifm
-- doom emacs
 - power-profiles-daemon
 - gruvbox-dark-gtk
 - gruvbox-dark-icons-gtk
@@ -46,3 +45,8 @@
 - htop
 - brightnessctl
 - cliphist
+- ttf-nerd-fonts-symbols-2048-em
+
+# not managed by the package manager
+- lunarvim
+- flix-cli