diff --git a/_bin/import-gsettings b/_bin/import-gsettings
new file mode 100755
index 0000000..967620f
--- /dev/null
+++ b/_bin/import-gsettings
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# usage: import-gsettings
+config="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-3.0/settings.ini"
+if [ ! -f "$config" ]; then exit 1; fi
+
+gnome_schema="org.gnome.desktop.interface"
+gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')"
+font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
+gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
+gsettings set "$gnome_schema" icon-theme "$icon_theme"
+gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
+gsettings set "$gnome_schema" font-name "$font_name"
diff --git a/_bin/launcher b/_bin/launcher
index a284c8c..7d649d4 100755
--- a/_bin/launcher
+++ b/_bin/launcher
@@ -49,6 +49,6 @@ if command -v rofi &> /dev/null; then
 		-theme-str "#prompt-colon { enabled: false; }"
 elif command -v wofi &> /dev/null; then
 	COMMAND=wofi
-	$COMMAND --show drun
+	$COMMAND --show drun --color=$HOME/.cache/wal/colors
 fi
 
diff --git a/_config/i3/config b/_config/i3/config
deleted file mode 100644
index 5acaeb1..0000000
--- a/_config/i3/config
+++ /dev/null
@@ -1,162 +0,0 @@
-# use windows key for mod
-set $mod Mod4
-
-# quick-launch
-bindsym $mod+Return exec kitty
-bindsym $mod+Home exec thunar
-bindsym $mod+b exec firefox
-bindsym $mod+d exec --no-startup-id ~/bin/launcher
-bindsym --release $mod+g exec --no-startup-id ~/bin/screengrab
-
-# i3 actions
-bindsym $mod+Shift+c reload
-bindsym $mod+Shift+r restart
-
-# window bindings and behavior
-floating_modifier $mod
-focus_follows_mouse no
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# move window focus (Vim style)
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-
-# move window focus (with arrow keys)
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move window (Vim style)
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l move right
-
-# move window (with arrow keys)
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# splits
-bindsym $mod+u split h
-bindsym $mod+i split v
-
-# fullscreen
-bindsym $mod+f fullscreen
-
-# toggle tiling/floating
-bindsym $mod+Shift+space floating toggle
-
-# toggle focus between tiling/floating
-bindsym $mod+space focus mode_toggle
-
-# focus parent container
-bindsym $mod+a focus parent
-
-# switch to specific 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
-
-# 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 focus to adjacent output
-bindsym $mod+bracketleft focus output left
-bindsym $mod+bracketright focus output right
-
-# jump to workspace on same output
-bindsym $mod+Shift+bracketleft workspace prev_on_output
-bindsym $mod+Shift+bracketright workspace next_on_output
-
-mode "resize" {
-	bindsym h resize shrink width 10 px or 10 ppt
-	bindsym j resize grow height 10 px or 10 ppt
-	bindsym k resize shrink height 10 px or 10 ppt
-	bindsym l 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"
-
-
-# nice system menu
-set $mode_system System (e) logout, (r) reboot, (shift+s) shutdown
-mode "$mode_system" {
-	bindsym e exec --no-startup-id ~/bin/i3exit logout, mode "default"
-	bindsym r exec --no-startup-id ~/bin/i3exit reboot, mode "default"
-	bindsym Shift+s exec --no-startup-id ~/bin/i3exit shutdown, mode "default"
-
-	# back to normal: Enter or Escape
-	bindsym Return mode "default"
-	bindsym Escape mode "default"
-}
-bindsym $mod+Shift+e mode "$mode_system"
-
-# appearance
-font xft:artwiz lime 7
-default_border pixel 5
-font xft:Roboto 13
-# gaps inner 8
-# gaps outer 0
-
-# app specific launch flags
-for_window [class="Peek"] floating enable
-for_window [class="Puppet Pounders"] floating enable
-
-set_from_resource $fg i3wm.color7
-set_from_resource $bg i3wm.color2
-set_from_resource $bgalt i3wm.color8
-# set $fg #ff00ff
-# set $bg #00ff00
-# set $bgalt #ff00ff
-workspace_layout default
-
-# class						brdr	bg	   txt	   indic   childbdr
-client.focused				$bg		$bg    $fg	   $bg	   $bg
-client.focused_inactive   $bg	  $bg	 $fg	 $bg	 $bg
-client.unfocused			$bgalt	   $bgalt	 $fg	 $bg	 $bgalt
-
-# client.urgent			   $bg	   $bg	   $fg	   $bg	   $bg
-# client.placeholder	   $bg	   $bg	   $fg	   $bg	   $bg
-# client.background		   $bg
-
-# autostart
-#exec --no-startup-id wal -q -t -i ~/wallpaper --saturate 0.8
-exec_always ~/.config/polybar/launch.sh
-
diff --git a/_config/kitty/kitty.conf b/_config/kitty/kitty.conf
index ad9612b..402d07a 100644
--- a/_config/kitty/kitty.conf
+++ b/_config/kitty/kitty.conf
@@ -1,11 +1,15 @@
 font_family Envy Code R
 bold_font Envy Code R Bold
 italic_font Envy Code R Italic
+# font_family Meslo LG L DZ Nerd Font Mono
+italic_font auto
+bold_font auto
+bold_italic_font auto
 
-font_size 10.0
+font_size 12.0
 
 window_padding_width 2.0
 term xterm-256color
 enable_audio_bell no
 sync_to_monitor yes
-background_opacity 0.95
+background_opacity 0.99
diff --git a/_config/sway/config b/_config/sway/config
index 7147a85..8574173 100644
--- a/_config/sway/config
+++ b/_config/sway/config
@@ -171,3 +171,5 @@ bar {
 
 set $opacity 0.9
 for_window [app_id="kitty"] opacity $opacity;
+
+exec "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
diff --git a/_config/waybar/config b/_config/waybar/config
index 704f01b..5587dd7 100644
--- a/_config/waybar/config
+++ b/_config/waybar/config
@@ -1,18 +1,9 @@
 {
 	"layer": "top",
-	"modules-left": ["sway/workspaces", "mpd", "sway/mode"],
+	"modules-left": ["sway/workspaces", "sway/mode"],
 	"modules-center": [],
-	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "clock"],
-	"mpd": {
-		"tooltip": false,
-		"format": "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})",
-		"format-disconnected": "ﳌ",
-		"format-stopped": "",
-        "state-icons": {
-            "playing": "",
-            "paused": ""
-        }
-	},
+	"modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "clock", "tray"],
+	"enable-bar-scroll": true,
 	"pulseaudio": {
 		"tooltip": false,
 		"scroll-step": 5,
@@ -21,6 +12,9 @@
 			"default": ["奄", "奔", "墳"]
 		}
 	},
+	"temperature": {
+		"format": "{temperatureF}°F",
+	},
 	"network": {
 		"tooltip": false,
 		"format-wifi": " {essid} {ipaddr}",
@@ -33,5 +27,12 @@
 	"memory": {
 		"tooltip": false,
 		"format": " {}%"
-	}
+	},
+	"tray": {
+		"icon-size": 24,
+		"spacing": 5,
+	},
+	"clock": {
+		"format": "{:%a, %b %d %I:%M%p %Z %d/%m/%Y}",
+	},
 }
diff --git a/_config/waybar/style.css b/_config/waybar/style.css
index 4113256..152d794 100644
--- a/_config/waybar/style.css
+++ b/_config/waybar/style.css
@@ -1,167 +1,65 @@
-/*
- ********************************************
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
- *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
- *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
- *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
- ********************************************
- */
+@import url('/home/mark/.cache/wal/colors-waybar.css');
 
 * {
-	border: none;
-	border-radius: 0;
-	font-family: Nerd Font Hack;
-	font-size: 14px;
-	min-height: 24px;
+    border: none;
+    border-radius: 0;
+    font-size: 14px;
+    font-weight: bold;
+    font-family: Font Awesome, "Ubuntu", "Droid", "MesloLGL Nerd Font", Roboto, sans-serif;
 }
 
 window#waybar {
-	background: transparent;
+    color: @foreground;
+    background: rgba(0, 0, 0, 0);
 }
 
-window#waybar.hidden {
-	opacity: 0.2;
+.modules-right,
+.modules-left {
+    margin: 0;
+    padding: 2px 10px;
+    background-color: alpha(@background, 0.7);
 }
-
-#window {
-    margin-top: 8px;
-    padding-left: 16px;
-    padding-right: 16px;
-	border-radius: 26px;
-	transition: none;
-	/*
-    color: #f8f8f2;
-	background: #282a36;
-    */
-    color: transparent;
-	background: transparent;
+.modules-right {
+    border-radius: 0 0 0 10px;
 }
-
-window#waybar.termite #window,
-window#waybar.Firefox #window,
-window#waybar.Navigator #window,
-window#waybar.PCSX2 #window {
-    color: #4d4d4d;
-	background: #e6e6e6;
-}
-
-#workspaces {
-	margin-top: 8px;
-	margin-left: 12px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	background: #282a36;
-	transition: none;
+.modules-left {
+    border-radius: 0 0 10px 0;
 }
 
 #workspaces button {
-	transition: none;
-	color: #f8f8f2;
-	background: transparent;
-	font-size: 16px;
+    border-radius: 2px;
 }
-
-#workspaces button.focused {
-	color: #9aedfe;
-}
-
 #workspaces button:hover {
-	transition: none;
-	box-shadow: inherit;
-	text-shadow: inherit;
-	color: #ff79c6;
+    color: @color1;
+    animation-duration: 0.5s;
+    animation-name: blink;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+#workspaces button.focused {
+    color: @color2;
+}
+#workspaces button.urgent {
+    animation-duration: 0.5s;
+    animation-name: blink;
+    background-color: @color15;
+    animation-iteration-count: infinite;
 }
 
-#mpd {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	background: #282a36;
-	transition: none;
-	color: #4d4d4d;
-	background: #5af78e;
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#network,
+#pulseaudio,
+#tray,
+#mode {
+    padding: 0 10px;
 }
 
-#mpd.disconnected,
-#mpd.stopped {
-	color: #f8f8f2;
-	background: #282a36;
+@keyframes blink {
+    to {
+	padding-bottom: 3px;
+    }
 }
-
-#network {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #4d4d4d;
-	background: #bd93f9;
-}
-
-#pulseaudio {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #4d4d4d;
-	background: #9aedfe;
-}
-
-#temperature {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #4d4d4d;
-	background: #5af78e;
-}
-
-#cpu {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #4d4d4d;
-	background: #f1fa8c;
-}
-
-#memory {
-	margin-top: 8px;
-	margin-left: 8px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #4d4d4d;
-	background: #ff6e67;
-}
-
-#clock {
-	margin-top: 8px;
-	margin-left: 8px;
-	margin-right: 12px;
-	padding-left: 16px;
-	padding-right: 16px;
-	margin-bottom: 0;
-	border-radius: 26px;
-	transition: none;
-	color: #f8f8f2;
-	background: #282a36;
-}
-
diff --git a/_config/waybar/style2.css b/_config/waybar/style2.css
new file mode 100644
index 0000000..4113256
--- /dev/null
+++ b/_config/waybar/style2.css
@@ -0,0 +1,167 @@
+/*
+ ********************************************
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ *░░█▀█░█░░░█░█░█▀▀░░░█░█░█░░░▀█▀░█▀▄░█▀█░░*
+ *░░█▀▀░█░░░█░█░▀▀█░░░█░█░█░░░░█░░█▀▄░█▀█░░*
+ *░░▀░░░▀▀▀░▀▀▀░▀▀▀░░░▀▀▀░▀▀▀░░▀░░▀░▀░▀░▀░░*
+ *░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░*
+ ********************************************
+ */
+
+* {
+	border: none;
+	border-radius: 0;
+	font-family: Nerd Font Hack;
+	font-size: 14px;
+	min-height: 24px;
+}
+
+window#waybar {
+	background: transparent;
+}
+
+window#waybar.hidden {
+	opacity: 0.2;
+}
+
+#window {
+    margin-top: 8px;
+    padding-left: 16px;
+    padding-right: 16px;
+	border-radius: 26px;
+	transition: none;
+	/*
+    color: #f8f8f2;
+	background: #282a36;
+    */
+    color: transparent;
+	background: transparent;
+}
+
+window#waybar.termite #window,
+window#waybar.Firefox #window,
+window#waybar.Navigator #window,
+window#waybar.PCSX2 #window {
+    color: #4d4d4d;
+	background: #e6e6e6;
+}
+
+#workspaces {
+	margin-top: 8px;
+	margin-left: 12px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	background: #282a36;
+	transition: none;
+}
+
+#workspaces button {
+	transition: none;
+	color: #f8f8f2;
+	background: transparent;
+	font-size: 16px;
+}
+
+#workspaces button.focused {
+	color: #9aedfe;
+}
+
+#workspaces button:hover {
+	transition: none;
+	box-shadow: inherit;
+	text-shadow: inherit;
+	color: #ff79c6;
+}
+
+#mpd {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	background: #282a36;
+	transition: none;
+	color: #4d4d4d;
+	background: #5af78e;
+}
+
+#mpd.disconnected,
+#mpd.stopped {
+	color: #f8f8f2;
+	background: #282a36;
+}
+
+#network {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #4d4d4d;
+	background: #bd93f9;
+}
+
+#pulseaudio {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #4d4d4d;
+	background: #9aedfe;
+}
+
+#temperature {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #4d4d4d;
+	background: #5af78e;
+}
+
+#cpu {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #4d4d4d;
+	background: #f1fa8c;
+}
+
+#memory {
+	margin-top: 8px;
+	margin-left: 8px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #4d4d4d;
+	background: #ff6e67;
+}
+
+#clock {
+	margin-top: 8px;
+	margin-left: 8px;
+	margin-right: 12px;
+	padding-left: 16px;
+	padding-right: 16px;
+	margin-bottom: 0;
+	border-radius: 26px;
+	transition: none;
+	color: #f8f8f2;
+	background: #282a36;
+}
+
diff --git a/_xinitrc/xinitrc.nisse b/_xinitrc/xinitrc.nisse
new file mode 100755
index 0000000..5a4a16e
--- /dev/null
+++ b/_xinitrc/xinitrc.nisse
@@ -0,0 +1,5 @@
+#!/bin/sh
+if_have() {
+	command -v $1 2>&1> /dev/null
+}
+~/.screenlayout/horiz-vert-4k-flip.sh
diff --git a/xinitrc b/xinitrc
old mode 100644
new mode 100755