diff --git a/.config/networkmanager-dmenu/config.ini b/.config/networkmanager-dmenu/config.ini
index 7365a30..545ee11 100644
--- a/.config/networkmanager-dmenu/config.ini
+++ b/.config/networkmanager-dmenu/config.ini
@@ -1,5 +1,5 @@
 [dmenu]
-dmenu_command = bash -c "wofi -m -d -i -I -G -q -k /dev/null"
+dmenu_command = bash -c "wofi -s ~/.config/wofi/nmdmenu.css -m -d -i -I -G -q -W "20%%" -p "NetworkManager" -k /dev/null"
 rofi_highlight = False
 wofi_mode = True
 pinentry = pinentry-qt
diff --git a/.config/waybar/config b/.config/waybar/config
index 04afea4..0f23eb1 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -6,7 +6,7 @@
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": ["sway/window"],
     //"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
-    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "battery", "clock", "tray"],
+    "modules-right": ["pulseaudio", "backlight", "idle_inhibitor", "network", "battery", "clock", "tray"],
 
     "include": "~/.config/waybar/modules",
 }
diff --git a/.config/waybar/modules b/.config/waybar/modules
index b2cdef6..6d2f66e 100644
--- a/.config/waybar/modules
+++ b/.config/waybar/modules
@@ -58,7 +58,7 @@
         "format": "{icon}",
 
         "format-alt": "{icon} {signalStrength}%",
-        "format-alt-click": "click-right",
+        "format-alt-click": "click-middle",
 
         "format-icons": {
             "wifi": [""],
@@ -69,7 +69,8 @@
 
         "interval": 10,
 
-        "on-click": "swaymsg 'set $PROP floating; exec alacritty -e nmtui'",
+        "on-click": "networkmanager_wofi",
+        "on-click-right": "swaymsg 'set $PROP floating; exec alacritty -e nmtui'",
 
         "tooltip": true,
         "tooltip-format": "Connected via {ifname}\nIP: {ipaddr}/{cidr}\nBandwidth: {bandwidthDownBits} | {bandwidthUpBits}",
diff --git a/.config/wofi/nmdmenu.css b/.config/wofi/nmdmenu.css
new file mode 100644
index 0000000..3331513
--- /dev/null
+++ b/.config/wofi/nmdmenu.css
@@ -0,0 +1,42 @@
+window {
+/*margin: 0px;
+border: 1px solid #4286f5;
+background-color: #282a36;*/
+font-family: "Symbol Nerd Fonts", monospace;
+}
+
+/*
+#input {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+background-color: #44475a;
+}
+
+#inner-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#outer-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#scroll {
+margin: 0px;
+border: none;
+}
+
+#text {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+}
+
+#entry:selected {
+background-color: #44475a;
+}
+*/
diff --git a/.config/wofi/oldstyle.css b/.config/wofi/oldstyle.css
new file mode 100644
index 0000000..95c2399
--- /dev/null
+++ b/.config/wofi/oldstyle.css
@@ -0,0 +1,39 @@
+window {
+margin: 0px;
+border: 1px solid #4286f5;
+background-color: #282a36;
+}
+
+#input {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+background-color: #44475a;
+}
+
+#inner-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#outer-box {
+margin: 5px;
+border: none;
+background-color: #282a36;
+}
+
+#scroll {
+margin: 0px;
+border: none;
+}
+
+#text {
+margin: 5px;
+border: none;
+color: #f8f8f2;
+}
+
+#entry:selected {
+background-color: #44475a;
+}
diff --git a/.config/wofi/oxide.rasi b/.config/wofi/oxide.rasi
new file mode 100644
index 0000000..028916f
--- /dev/null
+++ b/.config/wofi/oxide.rasi
@@ -0,0 +1,143 @@
+/**
+ * Oxide Color theme
+ * User: dikiaap
+ * Copyright: Diki Ananta
+ **/
+* {
+    selected-normal-foreground:  @lightfg;
+    foreground:                  rgba ( 196, 202, 212, 100 % );
+    normal-foreground:           @foreground;
+    alternate-normal-background: rgba ( 42, 42, 42, 100 % );
+    red:                         rgba ( 194, 65, 65, 100 % );
+    selected-urgent-foreground:  @lightfg;
+    blue:                        rgba ( 43, 131, 166, 100 % );
+    urgent-foreground:           @lightfg;
+    alternate-urgent-background: @red;
+    active-foreground:           @lightfg;
+    lightbg:                     @foreground;
+    selected-active-foreground:  @lightfg;
+    alternate-active-background: @blue;
+    background:                  rgba ( 33, 33, 33, 100 % );
+    alternate-normal-foreground: @foreground;
+    normal-background:           @background;
+    lightfg:                     rgba ( 249, 249, 249, 100 % );
+    selected-normal-background:  rgba ( 90, 90, 90, 100 % );
+    border-color:                @foreground;
+    spacing:                     2;
+    separatorcolor:              rgba ( 183, 183, 183, 100 % );
+    urgent-background:           @red;
+    selected-urgent-background:  rgba ( 214, 78, 78, 100 % );
+    alternate-urgent-foreground: @urgent-foreground;
+    background-color:            rgba ( 0, 0, 0, 0 % );
+    alternate-active-foreground: @active-foreground;
+    active-background:           @blue;
+    selected-active-background:  rgba ( 39, 141, 182, 100 % );
+}
+window {
+    background-color: @background;
+    border:           0;
+    padding:          8;
+}
+mainbox {
+    border:  0;
+    padding: 0;
+}
+message {
+    border:       2px dash 0px 0px;
+    border-color: @separatorcolor;
+    padding:      1px;
+}
+textbox {
+    text-color: @foreground;
+}
+listview {
+    fixed-height: 0;
+    border:       0;
+    border-color: @separatorcolor;
+    spacing:      2px;
+    scrollbar:    true;
+    padding:      2px 0px 0px;
+}
+element {
+    border:  0;
+    padding: 1px;
+}
+element normal.normal {
+    background-color: @normal-background;
+    text-color:       @normal-foreground;
+}
+element normal.urgent {
+    background-color: @urgent-background;
+    text-color:       @urgent-foreground;
+}
+element normal.active {
+    background-color: @active-background;
+    text-color:       @active-foreground;
+}
+element selected.normal {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+element selected.urgent {
+    background-color: @selected-urgent-background;
+    text-color:       @selected-urgent-foreground;
+}
+element selected.active {
+    background-color: @selected-active-background;
+    text-color:       @selected-active-foreground;
+}
+element alternate.normal {
+    background-color: @alternate-normal-background;
+    text-color:       @alternate-normal-foreground;
+}
+element alternate.urgent {
+    background-color: @alternate-urgent-background;
+    text-color:       @alternate-urgent-foreground;
+}
+element alternate.active {
+    background-color: @alternate-active-background;
+    text-color:       @alternate-active-foreground;
+}
+scrollbar {
+    width:        4px;
+    border:       0;
+    handle-color: rgba ( 85, 85, 85, 100 % );
+    handle-width: 8px;
+    padding:      0;
+}
+mode-switcher {
+    border:       2px dash 0px 0px;
+    border-color: @separatorcolor;
+}
+button {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+button selected {
+    background-color: @selected-normal-background;
+    text-color:       @selected-normal-foreground;
+}
+inputbar {
+    spacing:    0px;
+    text-color: @normal-foreground;
+    padding:    1px;
+    children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+case-indicator {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+entry {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+prompt {
+    spacing:    0;
+    text-color: @normal-foreground;
+}
+textbox-prompt-colon {
+    expand:     false;
+    str:        ":";
+    margin:     0px 0.3000em 0.0000em 0.0000em;
+    text-color: inherit;
+}
diff --git a/.config/wofi/slate.rasi b/.config/wofi/slate.rasi
new file mode 100644
index 0000000..d6d29b3
--- /dev/null
+++ b/.config/wofi/slate.rasi
@@ -0,0 +1,43 @@
+* {
+  background-color: #282C33;
+  border-color: #2e343f;
+  text-color: #8ca0aa;
+  spacing: 0;
+  width: 512px;
+}
+
+inputbar {
+  border: 0 0 1px 0;
+  children: [prompt,entry];
+}
+
+prompt {
+  padding: 16px;
+  border: 0 1px 0 0;
+}
+
+textbox {
+  background-color: #2e343f;
+  border: 0 0 1px 0;
+  border-color: #282C33;
+  padding: 8px 16px;
+}
+
+entry {
+  padding: 16px;
+}
+
+listview {
+  cycle: false;
+  margin: 0 0 -1px 0;
+  scrollbar: false;
+}
+
+element {
+  border: 0 0 1px 0;
+  padding: 16px;
+}
+
+element selected {
+  background-color: #2e343f;
+}
\ No newline at end of file