diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index bc8589d..39754fd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -40,7 +40,7 @@ bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
 #bindsym $mod+d exec dmenu_run
-bindsym $mod+d exec rofi -show drun -theme meli-dark
+bindsym $mod+d exec rofi -show drun
 
 # There also is the (new) i3-dmenu-desktop which only displays applications
 # shipping a .desktop file. It is a wrapper around dmenu, so you need that
diff --git a/picom/.config/picom/config b/picom/.config/picom/config
index f902e4c..354215f 100644
--- a/picom/.config/picom/config
+++ b/picom/.config/picom/config
@@ -63,6 +63,6 @@ blur-background-exclude = [
     "window_type = 'utility'",
     "window_type = 'dialog'",
     "window_type = 'notification'",
-    "window_type = 'normal' && !class_g = 'URxvt'",
+    "window_type = 'normal' && !class_g = 'URxvt' && !class_g = 'Rofi'",
     "class_g = 'TeamSpeak 3'"
 ];
diff --git a/rofi/.config/rofi/config b/rofi/.config/rofi/config
deleted file mode 100644
index 370c29e..0000000
--- a/rofi/.config/rofi/config
+++ /dev/null
@@ -1,8 +0,0 @@
-rofi.combi-modi:    window,drun,ssh
-;rofi.theme:        solarized
-rofi.font:          Ubuntu Nerd Fonts 13
-rofi.modi:          drun,calc
-rofi.show:          drun,calc
-rofi.show-icons:    true
-rofi.sidebar-mode:  true
-
diff --git a/rofi/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi
new file mode 100644
index 0000000..391217e
--- /dev/null
+++ b/rofi/.config/rofi/config.rasi
@@ -0,0 +1,6 @@
+configuration {
+  modi: "drun";
+/*font: "Ubuntu Nerd Fonts 13";*/
+  theme: "themes/meli-adwaita-pink";
+}
+
diff --git a/rofi/.config/rofi/scripts/network/config b/rofi/.config/rofi/scripts/network/config
deleted file mode 100755
index 3531faa..0000000
--- a/rofi/.config/rofi/scripts/network/config
+++ /dev/null
@@ -1,19 +0,0 @@
-# Config for rofi-wifi-menu
-
-# position values:
-# 1 2 3
-# 8 0 4
-# 7 6 5
-POSITION=3
-
-#y-offset
-YOFF=17
-
-#x-offset
-XOFF=0
-
-#fields to be displayed
-FIELDS=SSID,SECURITY,BARS
-
-#font
-FONT="UbuntuMono Nerd Font 8"
diff --git a/rofi/.config/rofi/scripts/network/network.sh b/rofi/.config/rofi/scripts/network/network.sh
deleted file mode 100755
index c70b3f0..0000000
--- a/rofi/.config/rofi/scripts/network/network.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-
-# Starts a scan of available broadcasting SSIDs
-# nmcli dev wifi rescan
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-FIELDS=SSID,SECURITY
-POSITION=0
-YOFF=0
-XOFF=0
-FONT="DejaVu Sans Mono 8"
-
-if [ -r "$DIR/config" ]; then
-	source "$DIR/config"
-elif [ -r "$HOME/.config/rofi/wifi" ]; then
-	source "$HOME/.config/rofi/wifi"
-else
-	echo "WARNING: config file not found! Using default values."
-fi
-
-LIST=$(nmcli --fields "$FIELDS" device wifi list | sed '/^--/d')
-# For some reason rofi always approximates character width 2 short... hmmm
-RWIDTH=$(($(echo "$LIST" | head -n 1 | awk '{print length($0); }')+2))
-# Dynamically change the height of the rofi menu
-LINENUM=$(echo "$LIST" | wc -l)
-# Gives a list of known connections so we can parse it later
-KNOWNCON=$(nmcli connection show)
-# Really janky way of telling if there is currently a connection
-CONSTATE=$(nmcli -fields WIFI g)
-
-CURRSSID=$(LANGUAGE=C nmcli -t -f active,ssid dev wifi | awk -F: '$1 ~ /^yes/ {print $2}')
-
-if [[ ! -z $CURRSSID ]]; then
-	HIGHLINE=$(echo  "$(echo "$LIST" | awk -F "[  ]{2,}" '{print $1}' | grep -Fxn -m 1 "$CURRSSID" | awk -F ":" '{print $1}') + 1" | bc )
-fi
-
-# HOPEFULLY you won't need this as often as I do
-# If there are more than 8 SSIDs, the menu will still only have 8 lines
-if [ "$LINENUM" -gt 8 ] && [[ "$CONSTATE" =~ "enabled" ]]; then
-	LINENUM=8
-elif [[ "$CONSTATE" =~ "disabled" ]]; then
-	LINENUM=1
-fi
-
-
-if [[ "$CONSTATE" =~ "enabled" ]]; then
-	TOGGLE="toggle off"
-elif [[ "$CONSTATE" =~ "disabled" ]]; then
-	TOGGLE="toggle on"
-fi
-
-
-
-CHENTRY=$(echo -e "$TOGGLE\nmanual\n$LIST" | uniq -u | rofi -dmenu -p "Wi-Fi SSID: " -lines "$LINENUM" -a "$HIGHLINE" -location "$POSITION" -yoffset "$YOFF" -xoffset "$XOFF" -font "$FONT" -width -"$RWIDTH")
-#echo "$CHENTRY"
-CHSSID=$(echo "$CHENTRY" | sed  's/\s\{2,\}/\|/g' | awk -F "|" '{print $1}')
-#echo "$CHSSID"
-
-# If the user inputs "manual" as their SSID in the start window, it will bring them to this screen
-if [ "$CHENTRY" = "manual" ] ; then
-	# Manual entry of the SSID and password (if appplicable)
-	MSSID=$(echo "enter the SSID of the network (SSID,password)" | rofi -dmenu -p "Manual Entry: " -font "$FONT" -lines 1)
-	# Separating the password from the entered string
-	MPASS=$(echo "$MSSID" | awk -F "," '{print $2}')
-
-	#echo "$MSSID"
-	#echo "$MPASS"
-
-	# If the user entered a manual password, then use the password nmcli command
-	if [ "$MPASS" = "" ]; then
-		nmcli dev wifi con "$MSSID"
-	else
-		nmcli dev wifi con "$MSSID" password "$MPASS"
-	fi
-
-elif [ "$CHENTRY" = "toggle on" ]; then
-	nmcli radio wifi on
-
-elif [ "$CHENTRY" = "toggle off" ]; then
-	nmcli radio wifi off
-
-else
-
-	# If the connection is already in use, then this will still be able to get the SSID
-	if [ "$CHSSID" = "*" ]; then
-		CHSSID=$(echo "$CHENTRY" | sed  's/\s\{2,\}/\|/g' | awk -F "|" '{print $3}')
-	fi
-
-	# Parses the list of preconfigured connections to see if it already contains the chosen SSID. This speeds up the connection process
-	if [[ $(echo "$KNOWNCON" | grep "$CHSSID") = "$CHSSID" ]]; then
-		nmcli con up "$CHSSID"
-	else
-		if [[ "$CHENTRY" =~ "WPA2" ]] || [[ "$CHENTRY" =~ "WEP" ]]; then
-			WIFIPASS=$(echo "if connection is stored, hit enter" | rofi -dmenu -p "password: " -lines 1 -font "$FONT" )
-		fi
-		nmcli dev wifi con "$CHSSID" password "$WIFIPASS"
-	fi
-
-fi
diff --git a/rofi/.config/rofi/themes/meli-adwaita-pink.rasi b/rofi/.config/rofi/themes/meli-adwaita-pink.rasi
new file mode 100644
index 0000000..2ed92d2
--- /dev/null
+++ b/rofi/.config/rofi/themes/meli-adwaita-pink.rasi
@@ -0,0 +1,145 @@
+/*
+  Title: Meli Adwaita Pink
+  Author: Meliurwen
+  Docs: https://github.com/davatorium/rofi/blob/next/doc/rofi-theme.5.markdown
+  Rofi version: 1.5.4
+*/
+
+configuration {
+  display-drun: "";
+  show-icons:   true;
+}
+
+* {
+  transparent:         #00000000;
+  background:          #282a36F0;
+  foreground:          #f8f8f2;
+  selected-color:      #c5457b;
+  window-border-color: #9e1553;
+  urgent-color:        #900000;
+  active-color:        #ff7600;
+}
+
+#window {
+  background-color: @background;
+  border-color:     @window-border-color;
+  font:             "Ubuntu 16";
+  transparency:     "real";
+  location:         center;
+  anchor:           center;
+  border:           1;
+  padding:          25;
+  fullscreen:       false;
+  width:            40%;
+/*height:           40%; if enabled `lines` in `listview` has no effect*/
+  x-offset:         0;
+  y-offset:         0;
+}
+
+#mainbox {
+  background-color: @transparent;
+  children:         [inputbar, message, listview];
+}
+
+#inputbar {
+  background-color: inherit;
+  children:         [prompt, entry];
+}
+
+#prompt {
+  background-color: inherit;
+  text-color:       @foreground;
+  padding:          0px 2px 0px 2px;
+}
+
+#entry {
+  background-color: inherit;
+  text-color:       @foreground;
+  padding:          0px 0px 4px 4px;
+}
+
+#message {
+  background-color: inherit;
+  border:           1;
+  border-color:     @selected-color;
+  padding:          5;
+}
+
+#listview {
+  background-color: inherit;
+  padding:          2px 0px 0px;
+  spacing:          2px;
+  columns:          1;
+  scrollbar:        true;
+  cycle:            false;
+  lines:            8;
+}
+
+#scrollbar {
+  background-color: inherit;
+  handle-color:     @selected-color;
+  handle-width:     8px;
+  border:           1;
+  border-color:     @selected-color;
+  padding:          1;
+}
+
+#element {
+  border:  0;
+  padding: 2;
+}
+
+#element normal.normal {
+  background-color: inherit;
+  text-color:       @foreground;
+}
+
+#element alternate.normal {
+  background-color: inherit;
+  text-color:       @foreground;
+}
+
+#element selected.normal {
+  background-color: @selected-color;
+  text-color:       @foreground;
+}
+
+#element normal.urgent {
+  background-color: @urgent-color;
+  text-color:       @foreground;
+}
+
+#element alternate.urgent {
+  background-color: @urgent-color;
+  text-color:       @foreground;
+}
+
+#element selected.urgent {
+  background-color: @selected-color;
+  text-color:       @urgent-color;
+}
+
+#element normal.active {
+  background-color: @active-color;
+  text-color:       @foreground;
+}
+
+#element alternate.active {
+  background-color: @active-color;
+  text-color:       @foreground;
+}
+
+#element selected.active {
+  background-color: @selected-color;
+  text-color:       @active-color;
+}
+
+#error-message {
+  background-color: inherit;
+}
+
+#textbox {
+  background-color: inherit;
+  text-color:       @foreground;
+}
+
diff --git a/rofi/.config/rofi/meli-dark.rasi b/rofi/.config/rofi/themes/meli-dark.rasi
similarity index 97%
rename from rofi/.config/rofi/meli-dark.rasi
rename to rofi/.config/rofi/themes/meli-dark.rasi
index 52e29ca..cc03bc7 100644
--- a/rofi/.config/rofi/meli-dark.rasi
+++ b/rofi/.config/rofi/themes/meli-dark.rasi
@@ -8,6 +8,7 @@
   border-color: #2e343f;
   text-color: @color-grey;
   border-radius: 8;
+  highlight:     underline bold;
 }
 
 mainbox {