diff --git a/config/rofi/tokyo.rofi b/config/rofi/tokyo.rofi
new file mode 100644
index 0000000..57eb025
--- /dev/null
+++ b/config/rofi/tokyo.rofi
@@ -0,0 +1,40 @@
+configuration {
+	modi:                "drun,window";
+	terminal:            "footclient";
+	show-icons:          true;
+	icon-theme:          "Tela-circle";
+	fixed-num-lines:     false;
+	location:            3;
+	drun-match-fields:   "name,exec";
+	drun-display-format: "{name}";
+	display-drun:        "Launch";
+	display-window:      "Window";
+	threads:             2;
+
+	// Select items in the listview with 'Alt+n'
+	kb-select-1:         "Alt+1";
+	kb-select-2:         "Alt+2";
+	kb-select-3:         "Alt+3";
+	kb-select-4:         "Alt+4";
+	kb-select-5:         "Alt+5";
+	kb-select-6:         "Alt+6";
+	kb-select-7:         "Alt+7";
+	kb-select-8:         "Alt+8";
+	kb-select-9:         "Alt+9";
+	kb-select-10:        "Alt+0";
+
+	// We have to bind these otherwise rofi complains with an error saying 'Alt+n' is already
+	// bound, even though they are just using the defaults which I don't care about
+	kb-custom-1:  "Super+1";
+	kb-custom-2:  "Super+2";
+	kb-custom-3:  "Super+3";
+	kb-custom-4:  "Super+4";
+	kb-custom-5:  "Super+5";
+	kb-custom-6:  "Super+6";
+	kb-custom-7:  "Super+7";
+	kb-custom-8:  "Super+8";
+	kb-custom-9:  "Super+9";
+	kb-custom-10: "Super+0";
+}
+
+@theme "tokyo"
diff --git a/config/rofi/tokyo.theme b/config/rofi/tokyo.theme
new file mode 100644
index 0000000..7168d3e
--- /dev/null
+++ b/config/rofi/tokyo.theme
@@ -0,0 +1,151 @@
+* {
+	font: "Noto Sans CJK JP 11";
+
+	bg:       #181818;
+	fg:       #FFFFFF;
+	selected: #3185FC;
+	urgent:   #0567F1;
+	active:   #86B8FD;
+
+	background-color: transparent;
+	text-color:       @fg;
+
+	padding: 0px;
+	spacing: 0px;
+}
+
+element {
+	cursor: pointer;
+
+	border:  0;
+	padding: 1px;
+	spacing: 5px;
+}
+
+element normal.normal {
+	background-color: @bg;
+	text-color:       @fg;
+}
+
+element normal.urgent {
+	background-color: @urgent;
+	text-color:       @bg;
+}
+
+element normal.active {
+	background-color: @active;
+	text-color:       @bg;
+}
+
+element selected.normal {
+	background-color: @selected;
+	text-color:       @bg;
+	border-radius:    4px;
+	border:           2px;
+}
+
+element selected.urgent {
+	background-color: @urgent;
+	text-color:       @bg;
+}
+
+element selected.active {
+	background-color: @active;
+	text-color:       @bg;
+}
+
+element-text {
+	background-color: transparent;
+	text-color:       inherit;
+	cursor:           inherit;
+	highlight:        inherit;
+	padding:          1px;
+}
+
+element-icon {
+	background-color: rgba(0, 0, 0, 0%);
+	size:             1.0000em;
+	cursor:           inherit;
+	text-color:       inherit;
+}
+
+window {
+	background-color: @bg;
+	border-color:     @selected;
+	padding:          4px;
+	border:           1px 1px 1px 1px;
+	border-radius:    0px;
+	width:            30%;
+	x-offset:        -5px;
+	y-offset:         5px;
+}
+
+mainbox {
+	padding: 0px;
+	border:  0px;
+}
+
+message {
+	padding:      1px;
+	border-color: @fg;
+	border:       2px dash 0px 0px;
+}
+
+textbox {
+	text-color: @fg;
+}
+
+listview {
+	scrollbar:    false;
+	border-color: @fg;
+	spacing:      0px;
+	padding:      2px;
+
+	fixed-height: false;
+	lines:         10;
+	require-input: true;
+	border:        1px dash 0px 0px;
+	anchor:        west;
+	position:      north;
+}
+
+button {
+	cursor:     pointer;
+	spacing:    0;
+	text-color: @fg;
+}
+
+button selected {
+	background-color: @selected;
+	text-color:       @bg;
+}
+
+inputbar {
+	padding:    1px;
+	spacing:    0;
+	text-color: @fg;
+	children:   [ prompt,textbox-prompt-colon,entry,case-indicator ];
+}
+
+entry {
+	text-color:        @fg;
+	cursor:            text;
+	spacing:           0;
+	padding:           0px 0px 2px 0px;
+	placeholder-color: #C2C2C2;
+	placeholder:       "Filter";
+}
+
+prompt {
+	spacing:    0;
+	text-color: @fg;
+}
+
+textbox-prompt-colon {
+	margin:     0px 0.3000em 0.0000em 0.0000em;
+	expand:     false;
+	str:        ":";
+	text-color: inherit;
+}
+
+/* vim:ft=css
diff --git a/config/sway/tokyo.sway b/config/sway/tokyo.sway
index d9d95b7..d91cd30 100644
--- a/config/sway/tokyo.sway
+++ b/config/sway/tokyo.sway
@@ -2,8 +2,7 @@
 # Variables
 #
 
-set $LAUNCH 'rofi -show drun'
-set $LOCK   'swaylock'
+set $LOCK 'swaylock'
 
 set $MOD Mod4
 
@@ -33,7 +32,8 @@ floating_modifier $MOD normal
 
 bindsym $MOD+return      exec footclient
 bindsym $MOD+shift+q     kill
-bindsym $MOD+d           exec $LAUNCH
+bindsym $MOD+d           exec 'rofi -show drun'
+bindsym $MOD+w           exec 'rofi -show window'
 
 bindsym $MOD+shift+r     reload
 bindsym $MOD+shift+e     exec swaynag -t warning -m 'Quit sway?' -b 'Exit' 'swaymsg exit'
diff --git a/dots b/dots
index f783619..cacf686 100755
--- a/dots
+++ b/dots
@@ -24,8 +24,11 @@ Install() {
 	case $HOSTNAME in
 		kanto|tokyo)
 			mkdir -p "$1/.config/sway"
+			mkdir -p "$1/.config/rofi"
 
-			cp "config/sway/$HOSTNAME.sway" "$1/.config/sway/config"
+			cp "config/sway/$HOSTNAME.sway"  "$1/.config/sway/config"
+			cp "config/rofi/$HOSTNAME.rofi"  "$1/.config/rofi/config.rasi"
+			cp "config/rofi/$HOSTNAME.theme" "$1/.config/rofi/$HOSTNAME.rasi"
 			;;
 	esac
 }
@@ -35,13 +38,20 @@ Pull() {
 	#
 	echo "[Info] :: Pulling dotfile changes from $1"
 
-	cp -r "$1/.config/nvim"          "config/"
-	cp    "$1/.config/starship.toml" "config/starship.toml"
-	cp    "$1/.config/sway/config"   "config/sway/$HOSTNAME.sway"
-
 	cp "$1/.bashrc"       "bashrc"
 	cp "$1/.bash_profile" "bash_profile"
 	cp "$1/.bash_aliases" "bash_aliases"
+
+	cp -r "$1/.config/nvim"                "config/"
+	cp    "$1/.config/starship.toml"       "config/starship.toml"
+
+	case $HOSTNAME in
+		kanto|tokyo)
+			cp "$1/.config/sway/config"         "config/sway/$HOSTNAME.sway"
+			cp "$1/.config/rofi/config.rasi"    "config/rofi/$HOSTNAME.rofi"
+			cp "$1/.config/rofi/$HOSTNAME.rasi" "config/rofi/$HOSTNAME.theme"
+			;;
+	esac
 }
 
 INSTALL_DIR=${2:-$HOME}