diff --git a/config/sway/config b/config/sway/config
index e3dcb43..960eaac 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -1,73 +1,41 @@
-##Welcome to your SWAY config!##
+# Welcome To Your Sway Config! #
 
-#Keyboard
-input * xkb_layout "gb"
-
-#Variables
-
-# Logo key. Use Mod1 for Alt. Mod4 is the Super Key
+# Modifier Key - Use Mod1 for Alt
 set $mod Mod4
-# Your preferred terminal emulator
+
+#Default Terminal Emulator
 set $term alacritty
-# Your preferred application launcher
+
+# Your preferred application launcher - (You can also use dmenu or rofi)
 set $menu wofi -c ~/.config/wofi/config -I
 
-#Font
-font pango:Noto Sans Regular 10
+# workspace layouts:
+#default i3 tiling mode
+workspace_layout default
+
 
 # Set inner/outer gaps
 gaps inner 2
 gaps outer 0
 
+#do not show titlebar on windows: 
+default_border pixel 1
 
+#workspace_layout stacking
 
-# Status Bar:
-
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-   swaybar_command waybar
-#}
-
-### Idle configuration
+#workspace_layout tabbed
+#Tiling mode is tabbed:
+#so each new window will open fullscreen as a tab, you can change between window-tabs with mouse or shortcut:
 #
-# Example configuration:
-#
-exec swayidle -w \
-    timeout 1070 'swaylock -f -C ~/.config/swaylock/config'\
-    timeout 770 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock -C ~/.config/swaylock/config'
-# 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
-# resumed. It will also lock your screen before your computer goes to sleep.
- 
-
-# Screenlocking
-bindsym $mod+f1 exec ~/.config/sway/scripts/lockman.sh
+#    [mod]+Left focus left (left arrow key)
+#    [mod]+Right focus right (right arrow key)
 
 
-# Screenshot with grim and swappy
-bindsym print exec ~/.config/sway/scripts/screenshotFull.sh
-bindsym Shift+print exec ~/.config/sway/scripts/screenshotArea.sh
+# get auth work with polkit-gnome:
+exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
-
-
-### Input configuration
-#
-# Example configuration:
-#
-   input "1267:12377:ELAN1300:00_04F3:3059_Touchpad" {
-       dwt enabled
-       tap enabled
-       natural_scroll enabled
-       middle_emulation enabled
-   }
-   # Wacom tablet configuration
-   input "1386:884:Wacom_Intuos_S_Pad" map_to_output HDMI-A-1
-   input "1386:884:Wacom_Intuos_S_Pen" map_to_output HDMI-A-1
-
-# 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.
+# Default Font - Waybar's Is In's It's Config
+font pango:Noto Sans Regular 10
 
 # thin borders:
 hide_edge_borders both
@@ -76,13 +44,16 @@ hide_edge_borders both
 floating_modifier $mod
 
 # start a terminal:
-bindsym $mod+Return exec alacritty
+bindsym $mod+Return exec $term
 
 # kill focused window:
 bindsym $mod+c kill
 
-# Start your launcher
-bindsym $mod+o exec $menu
+# open keybindings overview:
+#bindsym $mod+F1 exec "xed ~/.config/i3/keybindings"
+
+# Launch Wofi 
+bindsym $mod+d exec $menu
 
 # change focus:
 bindsym $mod+j focus left
@@ -118,7 +89,7 @@ bindsym $mod+v split v
 bindsym $mod+f fullscreen toggle
 
 # change container layout (stacked, tabbed, toggle split):
-bindsym $mod+Shift+s layout stacking  
+bindsym $mod+Shift+s layout stacking
 bindsym $mod+Shift+w layout tabbed
 bindsym $mod+Shift+e layout toggle split
 
@@ -131,44 +102,55 @@ bindsym $mod+space focus mode_toggle
 # focus the parent container:
 bindsym $mod+a focus parent
 
-# autostart start applications + bind program to workspace (uncomment to autostart):
-for_window [app_id="Alacritty"] move to workspace 1
-#exec alacritty
+# focus the child container:
+#bindsym $mod+d focus child
 
-for_window [app_id=firefox] move to workspace 2
-#exec firefox
 
-for_window [app_id=thunar] move to workspace 3
-#exec thunar
+# autostart start applications + bind program to workspace:
+assign [app_id="Alacritty"] 1
+for_window [app_id="Alacritty"] focus
 
-for_window [app_id=geany] move to workspace 4
-#exec geany
+assign [app_id="firefox"] 2
+for_window [app_id="firefox"] focus
 
-# Scratchpad:
+assign [class="Thunar"] 3
+for_window [class=Thunar] focus
 
-# Sway has a "scratchpad", which is a bag of holding for windows.
-# You can send windows there and get them back later.
+assign [app_id=thunar] 4
+for_window [app_id=thunar] focus
 
-#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 alt+tab scratchpad show
-bindsym $mod+minus scratchpad show
+assign [class="TelegramDesktop"] 5
+for_window [class=TelegramDesktop] focus
 
-#Autostart File
+# Autostart apps:
+#exec --no-startup-id sleep 2 && xfce4-terminal
+#exec --no-startup-id firefox
+#exec --no-startup-id sleep 3 && thunar
+#exec --no-startup-id blueberry-tray
 
-include ~/.config/sway/autostart
 
+#set wallpaper:
+exec swaybg -i ~/.config/sway/wallpaper.png
+
+# Idle Config
+exec swayidle -w\
+    timeout 1070 'swaylock -f -C ~/.config/swaylock/config'\
+    timeout 770 'swaymsg "output * dpms off"' \
+    resume 'swaymsg "output * dpms on"' \
+    before-sleep 'swaylock -C ~/.config/swaylock/config'
+# 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
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+
+# Desktop notifications_
+exec --no-startup-id /usr/bin/mako
 
 # set floating (nontiling)for apps needing it:
 for_window [class="Yad" instance="yad"] floating enable
 for_window [class="Galculator" instance="galculator"] floating enable
 for_window [class="Blueberry.py" instance="blueberry.py"] floating enable
 
-
 # set floating (nontiling) for special apps:
 for_window [class="Xsane" instance="xsane"] floating enable
 for_window [class="Pavucontrol" instance="pavucontrol"] floating enable
@@ -177,6 +159,12 @@ for_window [class="Blueberry.py" instance="blueberry.py"] floating enable
 for_window [class="Bluetooth-sendto" instance="bluetooth-sendto"] floating enable
 for_window [class="Pamac-manager"] floating enable
 
+# resize floating windows with mouse scroll:
+bindsym --whole-window --border $mod+button4 resize shrink height 5 px or 5 ppt
+bindsym --whole-window --border $mod+button5 resize grow height 5 px or 5 ppt
+bindsym --whole-window --border $mod+shift+button4 resize shrink width 5 px or 5 ppt
+bindsym --whole-window --border $mod+shift+button5 resize grow width 5 px or 5 ppt
+
 # Title format for windows
 for_window [shell="xdg_shell"] title_format "%title (%app_id)"
 for_window [shell="x_wayland"] title_format "%class - %title"
@@ -184,45 +172,114 @@ for_window [shell="x_wayland"] title_format "%class - %title"
 #Remove Titlebars
 for_window [class="^.*"] border pixel 1
 
-# resize floating windows with mouse scroll:
-bindsym --whole-window --border $mod+button4 resize shrink height 5 px or 5 ppt
-bindsym --whole-window --border $mod+button5 resize grow height 5 px or 5 ppt
-bindsym --whole-window --border $mod+shift+button4 resize shrink width 5 px or 5 ppt
-bindsym --whole-window --border $mod+shift+button5 resize grow width 5 px or 5 ppt
+# Scratchpad:
 
-#Switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    bindsym $mod+0 workspace 10
+# 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 alt+tab scratchpad show
+bindsym $mod+minus scratchpad show
+
+# switch to workspace:
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
 
 
-#Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace 1
-    bindsym $mod+Shift+2 move container to workspace 2
-    bindsym $mod+Shift+3 move container to workspace 3
-    bindsym $mod+Shift+4 move container to workspace 4
-    bindsym $mod+Shift+5 move container to workspace 5
-    bindsym $mod+Shift+6 move container to workspace 6
-    bindsym $mod+Shift+7 move container to workspace 7
-    bindsym $mod+Shift+8 move container to workspace 8
-    bindsym $mod+Shift+9 move container to workspace 9
-    bindsym $mod+Shift+0 move container to workspace 10
+# move focused container to workspace:
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+
 
 # reload the configuration file:
 bindsym $mod+Shift+c reload
 
-#App shortcuts
+# restart sway inplace (preserves your layout/session, can be used to upgrade sway):
+bindsym $mod+Shift+r restart
+
+# exit i3 (logs you out of your X session):
+bindsym $mod+Shift+q exec wlogout
+
+# resize window (you can also use the mouse for that):
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym ntilde resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Multimedia Keys:
+
+# volume
+bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume 0 +3%
+bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume 0 -3%
+
+# mute
+bindsym --locked XF86AudioMute exec pactl set-sink-mute 0 toggle
+
+bindsym XF86AudioPlay exec playerctl play
+bindsym XF86AudioPause exec playerctl pause
+bindsym XF86AudioNext exec playerctl next
+bindsym XF86AudioPrev exec playerctl previous
+
+# backlight
+
+bindsym XF86MonBrightnessUp exec brightnessctl -c backlight set +5%
+bindsym XF86MonBrightnessDown exec brightnessctl -c backlight set 5%-
+
+# App shortcuts
 bindsym $mod+w exec "/usr/bin/firefox"
 bindsym $mod+n exec "/usr/bin/thunar"
 
-#Colours and Border
+# Screenshots
+
+bindsym print exec ~/.config/sway/scripts/screenshotFull.sh
+bindsym Shift+print exec ~/.config/sway/scripts/screenshotArea.sh
+
+
+# Lock the system
+bindsym $mod+l exec ~/.config/sway/scripts/lockman.sh
+
+#Network Applet
+exec nm-applet --indicator
+
 set $bg-color            #2f343f
 set $inactive-bg-color   #2f343f
 set $text-color          #f3f4f5
@@ -237,25 +294,35 @@ client.unfocused        $inactive-bg-color $inactive-bg-color $inactive-text-col
 client.focused_inactive $inactive-bg-color $inactive-bg-color $inactive-text-color $indicator-color
 client.urgent           $urgent-bg-color   $urgent-bg-color   $text-color          $indicator-color
 
-default_border pixel 4
 
-# Special keys
+# Input configuration
+  input "1267:12363:ELAN0650:01_04F3:304B_Touchpad" {
+       dwt enabled
+       tap enabled
+       natural_scroll enabled
+       middle_emulation enabled
+   }
 
-bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume 0 +3%
-bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume 0 -3%
-bindsym --locked XF86AudioMute exec pactl set-sink-mute 0 toggle
+# You can get the names of your inputs by running: swaymsg -t get_input. 
+# Put your touchpad's ID to replace "1267:12363:ELAN0650:01_04F3:304B_Touchpad" (keep the quotation marks)
 
-bindsym XF86MonBrightnessUp exec brightnessctl -c backlight set +5%
-bindsym XF86MonBrightnessDown exec brightnessctl -c backlight set 5%-
+# Status Bar:
 
-bindsym XF86AudioPlay exec playerctl play-pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
+bar {
+   swaybar_command waybar
+}
 
-#GTK3 Theme and Icons. Set QT themes in qt5ct
-#set $gnome-schema org.gnome.desktop.interface
-#exec_always {
-#    gsettings set $gnome-schema gtk-theme 'Arc-Dark'
-#    gsettings set $gnome-schema icon-theme 'Papirus-Dark'
-#}
+#  Set GTK theme - Use qt5ct for QT configuration
+set $gnome-schema org.gnome.desktop.interface
+exec_always {
+    gsettings set $gnome-schema gtk-theme 'X-Arc-Darker'
+    gsettings set $gnome-schema icon-theme 'Arc-X-D'
+}
+
+# Clamshell Mode
+set $laptop <eDP-1>
+bindswitch --reload --locked lid:on output $laptop disable
+bindswitch --reload --locked lid:off output $laptop enable
+
+exec_always ~/.config/sway/scripts/clamshell.sh
 
diff --git a/config/sway/scripts/clamshell.sh b/config/sway/scripts/clamshell.sh
new file mode 100644
index 0000000..1404d36
--- /dev/null
+++ b/config/sway/scripts/clamshell.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/bash
+if cat /proc/acpi/button/lid/LID/state | grep -q open; then
+    swaymsg output <eDP-1> enable
+else
+    swaymsg output <eDP-1> disable
+fi
diff --git a/config/waybar/config b/config/waybar/config
index 48ea253..0bde48e 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -13,31 +13,30 @@
 
     "layer": "top",
 
-    "position": "bottom",
+    "position": "top",
 
     // If height property would be not present, it'd be calculated dynamically
     "height": 30,
 
     "modules-left": [
-        "custom/launcher",
         "sway/workspaces",
         "sway/mode"
     ],
     "modules-center": [
-        
+
     ],
     "modules-right": [
         "network",
-        "pulseaudio",
         "memory",
         "cpu",
         "temperature",
+        "pulseaudio",
         "custom/keyboard-layout",
         "battery",
         "backlight",
-        "tray",
         "clock#date",
         "clock#time",
+        "tray",
         "custom/power"
     ],
 
@@ -47,23 +46,18 @@
     // -------------------------------------------------------------------------
 
     "battery": {
-        "interval": 10,
-        "states": {
-            "warning": 30,
-            "critical": 15
-        },
-        // Connected to AC
-        "format": "  {icon}  {capacity}%", // Icon: bolt
-        // Not connected to AC
-        "format-discharging": "{icon}  {capacity}%",
-        "format-icons": [
-            "", // Icon: battery-full
-            "", // Icon: battery-three-quarters
-            "", // Icon: battery-half
-            "", // Icon: battery-quarter
-            ""  // Icon: battery-empty
-        ],
-        "tooltip": true
+    "states": {
+      // "good": 95,
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "{capacity}% {icon}",
+    "format-charging": "{capacity}% ",
+    "format-plugged": "{capacity}% ",
+    "format-alt": "{time} {icon}",
+    // "format-good": "", // An empty format will hide the module
+    // "format-full": "",
+    "format-icons": ["", "", "", "", ""]
     },
 
     "clock#time": {
@@ -99,7 +93,7 @@
 
     "memory": {
         "interval": 5,
-        "format": "  {}%", // Icon: memory
+        "format": " {}%", // Icon: memory
         "states": {
             "warning": 70,
             "critical": 90
@@ -112,6 +106,7 @@
         "format-ethernet": "  {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
         "format-disconnected": "⚠  Disconnected",
         "tooltip-format": "{ifname}: {ipaddr}"
+        
     },
 
     "sway/mode": {
@@ -125,35 +120,41 @@
     },
 
     "sway/workspaces": {
-        "disable-scroll": false,
-    "all-outputs": true,
-    "format": "{icon}",
-      },
-    "format-icons": {
-      "1":  "",
-      "2":  "",
-      "3":  "",
-      "4":  "",
-      "5":  "",
-      }
+        "all-outputs": false,
+        "disable-scroll": true,
+        "format": "{icon} {name}",
+        "format-icons": {
+            "1:www": "龜", // Icon: firefox-browser
+            "2:mail": "", // Icon: mail
+            "3:editor": "", // Icon: code
+            "4:terminals": "", // Icon: terminal
+            "5:portal": "", // Icon: terminal
+            "urgent": "",
+            "focused": "",
+            "default": ""
+        }
     },
-
     "pulseaudio": {
-		"format": "{icon} 奄 {volume:2}%",
-		"format-bluetooth": "{icon}  {volume}%",
-		"format-muted": "",
-		"format-icons": {
-			"headphones": "",
-			"default": [
-				"",
-				""
-			]
-		},
+    "scroll-step": 1, // %, can be a float
+    "format": "{volume}% {icon}",
+    "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",
-    "on-scroll-up": "pactl set-sink-volume 0 +3%",
-    "on-scroll-down": "pactl set-sink-volume 0 -3%",
-  },
-
+    "on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ -5%",
+    "on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ +5%",
+    },
 
     "temperature": {
       "critical-threshold": 80,
@@ -173,25 +174,19 @@
         "icon-size": 21,
         "spacing": 10
     },
-    
-     "custom/power": {
-    "format": "⏻",
-    "on-click": "exec wlogout",
-    "tooltip": false
-   },
-   "backlight": {
+    "backlight": {
     "interval": 5,
-    "format": "{percent}% {icon}",
+    "format": "{icon} {percent}%",
     "format-alt": "{percent}% {icon}",
     "format-alt-click": "click-right",
     "format-icons": ["🌕", "🌔", "🌓", "🌒", "🌑"],
     "on-scroll-down": "brightnessctl -c backlight set +5%",
     "on-scroll-up": "brightnessctl -c backlight set 5%-"
   },
-   
-   "custom/launcher": {
-    "format":" ",
-    "on-click": "exec wofi -c ~/.config/wofi/config -I",
+  "custom/power": {
+    "format": "⏻",
+    "on-click": "exec wlogout",
     "tooltip": false
-   }
+   },
+
 }
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 2e7c1af..7cf2949 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -58,6 +58,7 @@
 #battery,
 #clock,
 #cpu,
+#backlight
 #custom-keyboard-layout,
 #memory,
 #mode,
@@ -67,6 +68,10 @@
 #tray {
     padding-left: 10px;
     padding-right: 10px;
+    margin-right: 2px;
+	margin-top: 4px;
+	margin-bottom:4px;
+	margin-left: 2px;
 }
 
 
@@ -78,7 +83,10 @@
     animation-timing-function: linear;
     animation-iteration-count: infinite;
     animation-direction: alternate;
-    
+   	background-color: #545157;
+   	margin-right: 8px;
+   	margin-left: 8px;
+   	font-size: 13px;
 }
 
 #battery.warning {
@@ -101,11 +109,12 @@
 
 #clock {
     font-weight: bold;
-    color: #dbcb75;
+    background-color: #545157;
+    margin-left: 2px;
 }
 
 #cpu {
-  color: #40e612;
+ background-color: #545157;
 }
 
 #cpu.warning {
@@ -120,7 +129,6 @@
     animation-timing-function: linear;
     animation-iteration-count: infinite;
     animation-direction: alternate;
-    color: #96c6f8;
 }
 
 #memory.warning {
@@ -141,7 +149,8 @@
 }
 
 #network {
-    color: #3f6e22 ;
+  background-color: #545157;
+  
 }
 
 #network.disconnected {
@@ -149,11 +158,14 @@
 }
 
 #pulseaudio {
-   color: #208273;
+	color: @base07;
+    background-color: #545157;
+    margin-right: 8px;
 }
-
 #pulseaudio.muted {
-    color: #208273;
+   color: @base07;
+	margin-right: 8px;
+	
 }
 
 #custom-spotify {
@@ -169,7 +181,15 @@
 }
 
 #tray {
-    /* No styles */
+   
+    font-size: 17px;
+	margin-right: 7px;
+	margin-top: 4px;
+	margin-bottom:4px;
+	padding-left: 5px;
+	padding-right: 5px;
+	padding-top: 5px;
+	padding-bottom: 5px; 
 }
 
 #window {
@@ -195,20 +215,23 @@
     border-color: #c9545d;
     color: #c9545d;
 }
-
 #custom-power {
-   	font-size: 17px;
+    color: #eceff4;
+    font-size: 18px;
 	margin-right: 7px;
-	border-radius: 15px;
+	margin-top: 4px;
+	margin-bottom:4px;
+	padding-left: 10px;
+	padding-right: 10px;
+	background-color: #545157;
+  
+   
+    
+	
 }
-
-#custom-keyboard-layout {
-   color: #667c9d;
-}
-#custom-launcher {
-  margin-left: 10px;
-  margin-right: 10px;
-  font-size: 15px;
-  }
-
+#backlight { 
+  margin-right:5px;
+  
+}  
+ 
 
diff --git a/config/wlogout/icons/hibernate.png b/config/wlogout/icons/hibernate.png
new file mode 100644
index 0000000..7764f61
Binary files /dev/null and b/config/wlogout/icons/hibernate.png differ
diff --git a/config/wlogout/icons/lock.png b/config/wlogout/icons/lock.png
new file mode 100644
index 0000000..88c3af0
Binary files /dev/null and b/config/wlogout/icons/lock.png differ
diff --git a/config/wlogout/icons/logout.png b/config/wlogout/icons/logout.png
new file mode 100644
index 0000000..626feb4
Binary files /dev/null and b/config/wlogout/icons/logout.png differ
diff --git a/config/wlogout/icons/reboot.png b/config/wlogout/icons/reboot.png
new file mode 100644
index 0000000..ddf06d3
Binary files /dev/null and b/config/wlogout/icons/reboot.png differ
diff --git a/config/wlogout/icons/shutdown.png b/config/wlogout/icons/shutdown.png
new file mode 100644
index 0000000..39a4b2d
Binary files /dev/null and b/config/wlogout/icons/shutdown.png differ
diff --git a/config/wlogout/icons/suspend.png b/config/wlogout/icons/suspend.png
new file mode 100644
index 0000000..5b4885b
Binary files /dev/null and b/config/wlogout/icons/suspend.png differ
diff --git a/config/wlogout/layout b/config/wlogout/layout
new file mode 100644
index 0000000..a61f174
--- /dev/null
+++ b/config/wlogout/layout
@@ -0,0 +1,35 @@
+{
+    "label" : "lock",
+    "action" : "swaylock -C ~/.config/swaylock/config",
+    "text" : "Lock",
+    "keybind" : "l"
+}
+{
+    "label" : "hibernate",
+    "action" : "systemctl hibernate",
+    "text" : "Hibernate",
+}
+{
+    "label" : "logout",
+    "action" : "loginctl terminate-user $USER",
+    "text" : "Logout",
+    "keybind" : "e"
+}
+{
+    "label" : "shutdown",
+    "action" : "systemctl poweroff",
+    "text" : "Shutdown",
+    "keybind" : "s"
+}
+{
+    "label" : "suspend",
+    "action" : "systemctl suspend;swaylock -C ~/.config/swaylock/config",
+    "text" : "Suspend",
+    "keybind" : "u"
+}
+{
+    "label" : "reboot",
+    "action" : "systemctl reboot",
+    "text" : "Reboot",
+    "keybind" : "r"
+}
diff --git a/config/wlogout/style.css b/config/wlogout/style.css
new file mode 100644
index 0000000..4d4e3ce
--- /dev/null
+++ b/config/wlogout/style.css
@@ -0,0 +1,52 @@
+* {
+	background-image: none;
+}
+@keyframes fadeIn {
+  from {opacity: 0;}
+  to {opacity: 1;}
+}
+window {
+  background-color: rgba(46,52,64, 0.9);
+  font-size: 26px;
+  font-family: Product Sans;
+  animation: fadeIn;
+  animation-duration: 0.5s;
+}
+button {
+  color: #eceff4;
+  background-color: #4c566a;
+	border-style: solid;
+  margin: 20px;
+  border: 3px solid #3b4252;
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+button:focus, button:active, button:hover {
+  background-color: #5e81ac;
+	outline-style: none;
+}
+
+#lock {
+    background-image: image(url("~/.config/wlogout/icons/lock.png"), url("/usr/local/share/wlogout/icons/lock.png"));
+}
+
+#logout {
+    background-image: image(url("~/.config/wlogout/icons/logout.png"), url("/usr/local/share/wlogout/icons/logout.png"));
+}
+
+#suspend {
+    background-image: image(url("~/.config/wlogout/icons/suspend.png"), url("/usr/local/share/wlogout/icons/suspend.png"));
+}
+
+#hibernate {
+    background-image: image(url("~/.config/wlogout/icons/hibernate.png"), url("/usr/local/share/wlogout/icons/hibernate.png"));
+}
+
+#shutdown {
+    background-image: image(url("~/.config/wlogout/icons/shutdown.png"), url("/usr/local/share/wlogout/icons/shutdown.png"));
+}
+
+#reboot {
+    background-image: image(url("~/.config/wlogout/icons/reboot.png"), url("/usr/local/share/wlogout/icons/reboot.png"));
+}
diff --git a/config/wofi/config b/config/wofi/config
index 4a0740c..5b1d71e 100644
--- a/config/wofi/config
+++ b/config/wofi/config
@@ -1,4 +1,4 @@
-stylesheet=/home/sway/.config/wofi/style.css
+stylesheet=/home/test/.config/wofi/style.css
 hide_scroll=true
 show=drun,run
 width=700
@@ -8,7 +8,6 @@ term=alacritty
 location=middle
 allow_markup=true
 always_parse_args=true
-#show_all=true
 print_command=true
 layer=overlay
 insensitive=true
diff --git a/config/wofi/style.css b/config/wofi/style.css
index aa66c67..b0fbff8 100644
--- a/config/wofi/style.css
+++ b/config/wofi/style.css
@@ -12,6 +12,7 @@ margin: 0px 3px 3px 3px;
 #entry:selected {
 background-color:#4b3766;
 font-weight: bold;
+color: #d8dee9;
 }
  
 #text:selected {
@@ -49,7 +50,7 @@ margin-bottom: 10px;
 
 #text {
 padding: 5px;
-color: #d8dee9;
+color: #ffffff;
 background-color: transparent;
 }