diff --git a/i3/config b/i3/config
index 696f354..f000f9a 100644
--- a/i3/config
+++ b/i3/config
@@ -13,8 +13,7 @@ tiling_drag modifier
 #exec base
 bindsym $mod+Return exec kitty
 bindsym $mod+Shift+q kill
-bindsym $mod+d exec --no-startup-id ~/.config/rofi/retro_launcher.sh
-bindsym $mod+p exec "eww open powermenu"
+bindsym $mod+d exec --no-startup-id rofi -show drun -p "╔═[ SELECT PROGRAM ]═╗"
 
 # change focus
 bindsym $mod+j focus left
diff --git a/i3/i3lock-color b/i3/i3lock-color
new file mode 100644
index 0000000..409802c
--- /dev/null
+++ b/i3/i3lock-color
@@ -0,0 +1,22 @@
+i3lock \
+--inside-color=1f2430ff \
+--ring-color=73d0ffff \
+--line-color=00000000 \
+--separator-color=00000000 \
+--verif-color=b8cc52ff \
+--wrong-color=ff3333ff \
+--time-color=e6e1cfff \
+--date-color=95e6cbff \
+--layout-color=95e6cbff \
+--keyhl-color=ffc44cff \
+--bshl-color=ff3333ff \
+--insidever-color=1f2430ff \
+--insidewrong-color=1f2430ff \
+--ringver-color=b8cc52ff \
+--ringwrong-color=ff3333ff \
+--indicator \
+--radius=100 \
+--time-font="Iosevka SS14" \
+--date-font="Iosevka SS14" \
+--time-size=24 \
+--date-size=14
diff --git a/polybar/config b/polybar/config
new file mode 100644
index 0000000..6ec54ad
--- /dev/null
+++ b/polybar/config
@@ -0,0 +1,46 @@
+[colors]
+background = #0f1419
+foreground = #e6e1cf
+primary = #73d0ff
+secondary = #b8cc52
+alert = #ff3333
+highlight = #ffb454
+
+[bar/ayu]
+background = ${colors.background}
+foreground = ${colors.foreground}
+font-0 = "Iosevka SS14:size=12;2"
+modules-left = i3
+modules-center = clock
+modules-right = battery network volume
+separator = " | "
+fixed-center = true
+
+[module/clock]
+type = internal/date
+date = %a %d %b
+time = %H:%M
+format-prefix = 
+format-underline = ${colors.primary}
+
+[module/network]
+type = internal/network
+interface = wlan0
+format-connected =   %essid%
+format-disconnected = 睊
+format-underline = ${colors.secondary}
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = AC
+format-charging =  %percentage%%
+format-discharging =  %percentage%%
+format-full =  %percentage%%
+format-underline = ${colors.secondary}
+
+[module/volume]
+type = internal/volume
+format-volume = 墳 %percentage%%
+format-muted = 婢 muted
+format-underline = ${colors.primary}
diff --git a/rofi/ayu-retro.rasi b/rofi/ayu-retro.rasi
deleted file mode 100644
index 895faa5..0000000
--- a/rofi/ayu-retro.rasi
+++ /dev/null
@@ -1,162 +0,0 @@
-/* global settings and color variables */
-* {
-   blue:             #73d0ff;
-   darkblue:         #B48EAD;
-   cyan:             #95e6cb;
-   lightcyan:        #B48EAD;
-   green:            #bae67e;
-   red:              #ff3333;
-
-   dark1:            #0a0e14;
-   dark2:            #1f2430;
-   dark3:            #b3b1ad;
-   dark4:            #b3b1ad;
-
-   light1:           #e6e1cf;
-
-   background-color: @dark1;
-   border-color:     @dark2;
-   text-color:       @dark3;
-   dark-text-color:  @dark4;
-   main-color:       @blue;
-   highlight:        @light1;
-   urgent-color:     @red;
-   selected-color:   @lightcyan;
-}
-
-window {
-   background-color: @background-color;
-   width: 33%;
-   padding: 10px;
-   fullscreen: false;
-   border:  2px;
-   border-radius: 0px;
-   border-color: @border-color;
-}
-
-mainbox {
-   background-color: @background-color;
-   spacing:0px;
-}
-
-message {
-   padding: 6px 10px;
-   background-color: @background-color;
-}
-
-textbox {
-   text-color: @text-color;
-   background-color:@background-color;
-}
-
-listview {
-   fixed-height: true;
-   dynamic: true;
-   scrollbar: false;
-   spacing: 0px;
-   padding: 1px 0px 0px 0px;
-   margin: 0px 0px 1px 0px;
-   background: @background-color;
-}
-
-element {
-   padding: 4px 10px;
-}
-
-element normal.normal {
-   padding: 0px 15px;
-   background-color: @background-color;
-   text-color: @dark-text-color;
-}
-
-element normal.urgent {
-   background-color: @background-color;
-   text-color: @urgent-color;
-}
-
-element normal.active {
-   background-color: @background-color;
-   text-color: @main-color;
-}
-
-element selected.normal {
-    background-color: @border-color;
-    text-color:       @selected-color;
-}
-
-element selected.urgent {
-    background-color: @urgent-color;
-    text-color:       @background-color;
-}
-
-element selected.active {
-    background-color: @border-color;
-    text-color:       @green;
-}
-
-element alternate.normal {
-    background-color: @background-color;
-    text-color:       @dark-text-color;
-}
-
-element alternate.urgent {
-    background-color: @background-color;
-    text-color:       @urgent-color;
-}
-
-element alternate.active {
-    background-color: @background-color;
-    text-color:       @main-color;
-}
-
-scrollbar {
-   background-color: @background-color;
-   handle-color: @background-color;
-   handle-width: 0px;
-}
-
-mode-switcher {
-   background-color: @background-color;
-}
-
-button {
-   background-color: @background-color;
-   text-color:       @text-color;
-}
-
-button selected {
-    text-color:       @main-color;
-}
-
-inputbar {
-   background-color: @background-color;
-   spacing: 0px;
-   children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
-}
-
-prompt {
-   padding:0px 10px;
-   background-color: @background-color;
-   text-color: @highlight;
-}
-
-entry {
-   padding:0px 6px;
-   background-color:@background-color;
-   text-color:@light1;
-}
-
-case-indicator {
-   padding:6px 10px;
-   text-color:@main-color;
-   background-color:@background-color;
-}
-
-#textbox-prompt-colon {
-	padding:0px 0px;
-    expand:     false;
-    str:        ":";
-    margin:     0px 0.3em 0em 0em ;
-    text-color: @highlight;
-    background-color:@background-color;
-}
diff --git a/rofi/config.rasi b/rofi/config.rasi
index 29622ef..6c28e50 100644
--- a/rofi/config.rasi
+++ b/rofi/config.rasi
@@ -1,5 +1,5 @@
 
-//@theme "~/.config/rofi/ayu-retro.rasi"
+@theme "ayu-retro"
 
 configuration {
 	font: "Iosevka SS14 12";
diff --git a/rofi/powermenu.sh b/rofi/powermenu.sh
index 743edc2..fd6a258 100755
--- a/rofi/powermenu.sh
+++ b/rofi/powermenu.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 
-options="Shutdown\nReboot\nLock\nLogout\nCancel"
+options="Lock\nLogout\nShutdown\nReboot\nCancel"
 chosen=$(echo -e "$options" | rofi -dmenu \
-	-theme ~/.config/rofi/ayu-retro.rasi \
 	-p "╔═[ POWER MENU ]═╗" \
 	-lines 5)
 
 case "$chosen" in
-	*Shutdown) systemctl poweroff ;;
-	*Reboot) systemctl reboot ;;
 	*Lock) i3lock -c 000000 ;;
 	*Logout) i3-msg exit ;;
+	*Shutdown) systemctl poweroff ;;
+	*Reboot) systemctl reboot ;;
 	*Cancel) exit 0 ;;
 esac
diff --git a/rofi/retro_launcher.sh b/rofi/retro_launcher.sh
index c4807f4..39e6c93 100755
--- a/rofi/retro_launcher.sh
+++ b/rofi/retro_launcher.sh
@@ -16,4 +16,4 @@ kitty --class BootSplash -e bash -c "
 	tput sgr0
 " &
 sleep 1
-rofi -show drun -theme ~/.config/rofi/ayu-retro.rasi -p "╔═[ SELECT PROGRAM ]═╗"
+rofi -show drun -p "╔═[ SELECT PROGRAM ]═╗"
diff --git a/rofi/sidebar.rasi b/rofi/themes/ayu-retro.rasi
similarity index 58%
rename from rofi/sidebar.rasi
rename to rofi/themes/ayu-retro.rasi
index 69cd0a8..848348f 100644
--- a/rofi/sidebar.rasi
+++ b/rofi/themes/ayu-retro.rasi
@@ -1,110 +1,118 @@
 /**
  * ROFI Color theme
- * User: Qball
- * Copyright: Dave Davenport
+ * User: Fatmeat
+ * Copyright: SleepeeSoftware
  */
 
 * {
-    text-color:  #ffeedd;
-    background-color:  rgba(0,0,0,0);
-    dark: #1c1c1c;
-    // Black
-    black:       #3d352a;
-    lightblack:  #554444;
-    //
-    // Red
-    red:         #cd5c5c;
-    lightred:    #cc5533;
-    //
-    // Green
-    green:       #86af80;
-    lightgreen:  #88cc22;
-    //
-    // Yellow
-    yellow:      #e8ae5b;
-    lightyellow:     #ffa75d;
-    //
-    // Blue
-    blue:      #6495ed;
-    lightblue:     #87ceeb;
-    //
-    // Magenta
-    magenta:      #deb887;
-    lightmagenta:     #996600;
-    //
-    // Cyan
-    cyan:      #b0c4de;
-    lightcyan:     #b0c4de;
-    //
-    // White
-    white:      #bbaa99;
-    lightwhite:     #ddccbb;
-    //
-    // Bold, Italic, Underline
-    highlight:     bold #ffffff;
+	text-color:  #e6e1cf;
+	background-color: rgba(0,0,0,0);
+
+	dark:         #0f1419;
+	black:        #1f2430;
+	lightblack:   #3a3f4b;
+
+	red:          #ff3333;
+	lightred:     #ff5050;
+
+	green:        #b8cc52;
+	lightgreen:   #c2d94c;
+
+	yellow:       #ffc44c;
+	lightyellow:  #ffb454;
+
+	blue:         #59c2ff;
+	lightblue:    #73d0ff;
+
+	magenta:      #d4bfff;
+	lightmagenta: #c792ea;
+
+	cyan:         #95e6cb;
+	lightcyan:    #aad6ff;
+
+	white:        #e6e1cf;
+	lightwhite:   #ffffff;
+
+	highlight:    bold #ffffff;
 }
+
 window {
-    height:   100%;
+    height:   10em;
     width: 30em;
-    location: west;
-    anchor:   west;
+    location: north;
+    anchor:   north;
     border:  0px 2px 0px 0px;
-    text-color: @lightwhite;
+    text-color: ;
 }
+
 mode-switcher {
     border: 2px 0px 0px 0px;
     background-color: @lightblack;
     padding: 4px;
 }
+
 button selected {
     border-color: @lightgreen;
     text-color: @lightgreen;
 }
+
 inputbar {
     background-color: @lightblack;
     text-color: @lightgreen;
     padding: 4px;
     border: 0px 0px 2px 0px;
 }
+
 mainbox {
     expand: true;
     background-color: #1c1c1cee;
     spacing: 1em;
 }
+
 listview {
     padding: 0em 0.4em 0em 1em;
     dynamic: false;
     lines: 0;
 }
+
 element-text {
     background-color: inherit;
     text-color:       inherit;
 }
+
 element selected  normal {
     background-color: @blue;
 }
+
 element normal active {
     text-color: @lightblue;
 }
+
 element normal urgent {
     text-color: @lightred;
 }
+
 element alternate normal {
 }
+
 element alternate active {
     text-color: @lightblue;
 }
+
 element alternate urgent {
     text-color: @lightred;
 }
+
 element selected active {
     background-color: @lightblue;
     text-color: @dark;
 }
+
 element selected urgent {
     background-color: @lightred;
     text-color: @dark;
 }
+
 error-message {
     expand: true;
     background-color: red;