diff --git a/dot_config/sketchybar/plugins/executable_colordummy.sh b/dot_config/sketchybar/plugins/executable_colordummy.sh
index f10a393..ecaf9b2 100644
--- a/dot_config/sketchybar/plugins/executable_colordummy.sh
+++ b/dot_config/sketchybar/plugins/executable_colordummy.sh
@@ -163,5 +163,5 @@ sketchybar \
 # set the yabai colours as well
 yabai \
   -m config active_window_border_color "$(color pink)" \
-  -m config normal_window_border_color "$(color mauve)" \
-  -m config insert_feedback_color "$(color pink)"
+  -m config normal_window_border_color "$(color surface0)" \
+  -m config insert_feedback_color "$(color red)"
diff --git a/dot_config/yabai/executable_yabairc b/dot_config/yabai/executable_yabairc
index e141589..88a5506 100644
--- a/dot_config/yabai/executable_yabairc
+++ b/dot_config/yabai/executable_yabairc
@@ -17,26 +17,17 @@ done
 yabai -m config \
 	mouse_follows_focus off \
 	focus_follows_mouse off \
-	mouse_modifier fn \
+	mouse_modifier cmd \
 	mouse_action1 move \
 	mouse_action2 resize \
 	mouse_drop_action swap \
 	window_origin_display default \
 	window_placement second_child \
-	window_border off \
+	window_border on \
 	window_border_width 2 \
-	window_border_blur off \
-	window_opacity off \
-	window_opacity_duration 0.1 \
-	normal_window_opacity 1.0 \
 	window_shadow float \
-	auto_balance off \
-	split_ratio 0.50 \
+	auto_balance on \
 	layout bsp \
-	top_padding 0 \
-	bottom_padding 0 \
-	left_padding 0 \
-	right_padding 0 \
 	window_gap 0 \
 	window_animation_duration 0.1