diff --git a/.bash_profile b/.bash_profile
index 5112cad..724a2d4 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -17,7 +17,7 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 
 if [[ -z "$DISPLAY" ]] && [[ $(tty) = /dev/tty1 ]]; then
 	if [[ ! -z "$IS_LAPTOP" ]]; then
-		exec startx
+		exec dbus-run-session sway
 	else
 		exec start-sway.sh
 	fi
diff --git a/.config/sway/config b/.config/sway/config
index 846b5f8..4f1c51f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -99,7 +99,11 @@ exec swayidle -w \
 		xkb_layout us
 		xkb_variant colemak
 	}
-
+	input 1:1:AT_Translated_Set_2_keyboard {
+		xkb_layout "us"
+		xkb_variant "colemak"
+		xkb_options "caps:ctrl_modifier,altwin:swap_alt_win"
+	}
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.