diff --git a/' b/'
deleted file mode 100644
index a957e16c9307a06c2624d12acb7bb075d930d074..0000000000000000000000000000000000000000
--- a/'
+++ /dev/null
@@ -1,283 +0,0 @@
-# General Look and Feel
-font pango:"JetBrains Mono" 10
-include catppuccin-frappe
-
-# target                 title     bg    text   indicator  border
-client.focused           $lavender $base $text  $rosewater $lavender
-client.focused_inactive  $overlay0 $base $text  $rosewater $overlay0
-client.unfocused         $overlay0 $base $text  $rosewater $overlay0
-client.urgent            $peach    $base $peach $overlay0  $peach
-client.placeholder       $overlay0 $base $text  $overlay0  $overlay0
-client.background        $base
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
-# Your preferred terminal emulator
-set $term alacritty
-# Lockscreen command
-set $lockscreen swaylock -F
-
-# Wallpaper Daemon
-exec --no-startup-id swww-daemon
-
-# Notification Daemon
-exec --no-startup-id swaync
-# Toggle control center
-bindsym $mod+Shift+n exec swaync-client -t -sw
-
-# Take Screenshot
-set $screenshot grim $(xdg-user-dir PICTURES)/$(date +'%s_screenshot.png')
-bindsym Print exec $screenshot
-
-# Default Caps lock off and num-lock on
-input type:keyboard xkb_capslock disabled
-input type:keyboard xkb_numlock enabled
-
-
-# Information Notification Daemon
-exec --no-startup-id "avizo-service"
-
-# Binds for workspace Manager - Sov
-exec rm -f /tmp/sovpipe && mkfifo /tmp/sovpipe && tail -f /tmp/sovpipe | sov -t 500
-
-
-# For the custom 
-# exec_always "pkill -f 'python3? .+/swaymonad.py';  ~/.config/sway/swaymonad/swaymonad.py"
-
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-set $menu dmenu_path | rofi -show combi -combi-modes "window,run" | xargs swaymsg exec --
-
-gaps inner 10
-gaps outer 20
-smart_gaps inverse_outer
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-#
-# Example configuration:
-#   output HDMI-A-1 resolution 1920x1080 position 1920,0
-# You can get the names of your outputs by running: swaymsg -t get_outputs
-
-# Clipboard manager
-exec wl-paste -t text --watch clipman store --no-persist
-
-## Idle configuration
-exec swayidle -w \
-  before-sleep 'playerctl pause' \
-  before-sleep 'swaylock' \
-  timeout 300 'swaylock -f' \
-  timeout 330 'swaymsg "output * dpms off"' \
-  resume 'swaymsg "output * dpms on"' \
-  timeout 600 'swaymsg "output * power off"' \
-  resume 'swaymsg "output * power on"'
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# Screen will power-off 30 seconds after lock screen
-# resumed. It will also lock your screen before your computer goes to sleep.
-
-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
-
-### Key bindings
-#
-# Basics:
-#
-    # Start a terminal
-    bindsym $mod+Return exec $term
-
-    # Kill focused window
-    bindsym $mod+Shift+q kill
-
-    # Start your launcher
-    bindsym $mod+d exec $menu
-
-    # Lockscreen
-    bindsym $mod+Escape exec $lockscreen
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
-
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    bindsym $mod+0 workspace number 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9
-    bindsym $mod+Shift+0 move container to workspace number 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
-
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
-
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
-
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Special and Media Keys:
-#
-  # Manage volume controls using PulseAudio
-  bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-  bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-  bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-  bindsym --locked XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-
-  # Media Player Controls
-  bindsym XF86AudioPlay exec playerctl play-pause
-  bindsym XF86AudioNext exec playerctl next
-  bindsym XF86AudioPrev exec playerctl previous
-
-  # Manage Screen Brightness
-  bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 5%-
-  bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set 5%+
-
-  # Calculator Button
-  bindsym XF86Calculator exec kcalc
-
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
-    # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-    bindsym $mod+r mode "default"
-}
-bindsym $mod+r mode "resize"
-
-
-include /etc/sway/config.d/*
-
-
-#
-# External Configurations:
-#
-  # Sway(?) Bar
-  include config-bar
-
-  # Keybindings
-  include config-keybinds
-
-  # SwayFX Special Effects
-  include config-fancy
-
-  # Window-specific definitions
-  include config-window-specifics
diff --git a/rofi/config.rasi b/rofi/config.rasi
index 07b416f87282f3013580b424fb033b915b052022..ce873da9e22119c131ee1c2a69bd2dff9c14d7c3 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -9,10 +9,10 @@ configuration {
       sorting-method:    "name";
   }
   
-  modi: "run,drun,window";
+  modi: "drun,window";
   icon-theme: "Oranchelo";
   show-icons: true;
-  terminal: "konsole";
+  terminal: "alacritty";
   drun-display-format: "{icon} {name}";
   location: 0;
   disable-history: false;
diff --git a/rofi/rofi-power-options/rofi-power-options.sh b/rofi/rofi-power-options/rofi-power-options.sh
new file mode 100755
index 0000000000000000000000000000000000000000..683daf05b63cb2bba335b099b5e00f905672a715
--- /dev/null
+++ b/rofi/rofi-power-options/rofi-power-options.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# Function to display Rofi menu and execute selected command
+show_menu() {
+    local options=(
+        "reboot: Shut down and reboot the system"
+        "shutdown: Shut down and power-off the system"
+        "lock: Lock the screen"
+        "logout: Log out current user"
+        "suspend: Suspend the system"
+        "hibernate: Put the system into hibernation"
+        "hybrid-sleep: Put the system into hybrid-sleep state"
+        "suspend-then-hibernate: Suspend and then hibernate"
+        "soft-reboot: Perform a soft reboot of userspace"
+        "test: Just echo a test message"
+    )
+
+    # Display Rofi menu
+    selected=$(printf '%s\n' "${options[@]}" | rofi -dmenu -i -p "Choose an action:" | awk -F': ' '{print $1}')
+
+    # Execute selected command
+    case $selected in
+        "reboot")
+            echo "Executing command: systemctl reboot"
+            systemctl reboot
+            ;;
+        "shutdown")
+            echo "Executing command: systemctl poweroff"
+            systemctl poweroff
+            ;;
+        "lock")
+            echo "Locking screen..."
+            # Replace with your lock command
+            # Example: xlock, gnome-screensaver-command -l, etc.
+            ;;
+        "logout")
+            echo "Logging out..."
+            # Replace with your logout command
+            # Example: gnome-session-quit --logout --no-prompt
+            ;;
+        "suspend")
+            echo "Suspending the system..."
+            systemctl suspend
+            ;;
+        "hibernate")
+            echo "Putting the system into hibernation..."
+            systemctl hibernate
+            ;;
+        "hybrid-sleep")
+            echo "Putting the system into hybrid-sleep state..."
+            systemctl hybrid-sleep
+            ;;
+        "suspend-then-hibernate")
+            echo "Suspending then hibernating the system..."
+            systemctl suspend-then-hibernate
+            ;;
+        "soft-reboot")
+            echo "Performing a soft reboot of userspace..."
+            systemctl soft-reboot
+            ;;
+        "test")
+            echo "This is a test message."
+            ;;
+        *)
+            echo "No valid option selected."
+            ;;
+    esac
+}
+
+# Call function to show menu
+show_menu
+
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
index 561cae69ce8e771e309e0d5679897877833368bc..2713a7e8b6c513d551d13c2f7c8e58612470cdd5 100644
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -1,6 +1,5 @@
 // -*- mode: jsonc -*-
 {
-    // "layer": "top", // Waybar at top layer
     "position": "top", // Waybar position (top|bottom|left|right)
     // "height": 30, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
@@ -9,12 +8,11 @@
 
     // Choose the order of the modules
     "modules-left": [
+	"privacy",
         "sway/workspaces",
         "sway/mode",
         "sway/scratchpad",
-	"custom/arrow10",
         "custom/swww-haven",
-	"custom/arrow10",
         "custom/media"
     ],
     "modules-center": [
@@ -25,33 +23,32 @@
 	"idle_inhibitor",
 	"pulseaudio",
 	"network",
-	"power-profiles-daemon",
-	"cpu",
-        "memory",
-	"temperature",
+	"bluetooth",
 	"backlight",
 	"keyboard-state",
 	"battery",
+	"power-profiles-daemon",
 	"clock",
-        "tray"
+        "tray",
+	"custom/power"
     ],
     // Modules configuration
-    // "sway/workspaces": {
-    //     "disable-scroll": true,
-    //     "all-outputs": true,
-    //     "warp-on-scroll": false,
-    //     "format": "{name}: {icon}",
-    //     "format-icons": {
-    //         "1": "ï„ ",
-    //         "2": "",
-    //         "3": "ï„¡",
-    //         "4": "",
-    //         "5": "",
-    //         "urgent": "",
-    //         "focused": "",
-    //         "default": "ï„‘"
-    //     }
-    // },
+    "sway/workspaces": {
+      "disable-scroll": true,
+      "all-outputs": true,
+      "warp-on-scroll": false,
+      "format": "{icon} {name}",
+      "format-icons": {
+	// "1": "ï„ ",
+	// "2": "",
+	// "3": "ï„¡",
+	// "4": "",
+	// "5": "",
+	"urgent": "",
+	"focused": "",
+	"default": "ï„‘"
+      }
+    },
     "keyboard-state": {
         "numlock": true,
         "capslock": true,
@@ -71,6 +68,9 @@
         "tooltip": true,
         "tooltip-format": "{app}: {title}"
     },
+    "sway/window": {
+      "max-length": 50
+    },
     "mpd": {
         "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
         "format-disconnected": "Disconnected ",
@@ -113,33 +113,19 @@
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format-alt": "{:%Y-%m-%d}"
     },
-    "cpu": {
-        "format": "{usage}% ï‹›",
-        "tooltip": false
-    },
-    "memory": {
-        "format": "{}% "
-    },
-    "temperature": {
-        // "thermal-zone": 2,
-        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""]
-    },
+    "cpu": { "format": "{usage}% ï‹›", "tooltip": false },
+    "memory": { "format": "{}% " },
     "backlight": {
-        // "device": "acpi_video1",
         "format": "{percent}% {icon}",
-        //"format-icons": ["", "", "", "", "", "", "", "", ""]
-        "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+        // "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
     },
     "battery": {
         "states": {
             "good": 90,
-            "warning": 30,
-            "critical": 15
-        },
+            "warning": 40,
+            "critical": 20
+	},
         "format": "{capacity}% {icon}",
         "format-full": "{capacity}% {icon}",
         "format-charging": "{capacity}% ï—§",
@@ -149,9 +135,6 @@
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "power-profiles-daemon": {
       "format": "{icon}",
       "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
@@ -173,8 +156,10 @@
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
 	"on-click-right": "${HOME}/.config/waybar/nm-applet/rofi-network-manager.sh"
     },
+    "bluetooth":{
+      "min-length": 6
+    },
     "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}",
@@ -204,13 +189,27 @@
         "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     },
-    "custom/arrow10": {
-      "format": "î‚°",
-      "tooltip": false
-    },
-    "custom/arrow9": {
-      "format": "",
-      "tooltip": false
+    "privacy": {
+      "icon-spacing": 4,
+      "icon-size": 18,
+      "transition-duration": 250,
+      "modules": [
+	{
+	  "type": "screenshare",
+	  "tooltip": true,
+	  "tooltip-icon-size": 24
+	},
+	{
+	  "type": "audio-out",
+	  "tooltip": true,
+	  "tooltip-icon-size": 24
+	},
+	{
+	  "type": "audio-in",
+	  "tooltip": true,
+	  "tooltip-icon-size": 24
+	}
+      ]
     },
     "custom/swww-haven": {
       "format": " {} ",
@@ -218,6 +217,10 @@
       "return-type": "json",
       "exec": "$HOME/Workspace/swww-haven/bars/waybar.sh 2> /dev/null",
       "on-click": "swww-haven set"
+    },
+    "custom/power": {
+      "format": "   ",
+      "min-width":5,
+      "on-click": "${HOME}/.config/waybar/rofi-power-options/rofi-power-options.sh"
     }
-
 }
diff --git a/waybar/style.css b/waybar/style.css
index 693c77712d49fba0101f7a4fe245bfabc5555b84..b61f8161ed584986514f3e0f4d145bbd35ac2209 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -328,9 +328,3 @@ label:focus {
 #privacy-item.audio-out {
     background-color: #0069d4;
 }
-
-#custom-arrow10,
-#custom-arrow9
-{
-    font-size: 14px;
-}