diff --git a/.local/bin/kbswitcher b/.local/bin/kbswitcher
index 87d8c33..671fe33 100755
--- a/.local/bin/kbswitcher
+++ b/.local/bin/kbswitcher
@@ -13,14 +13,14 @@ else
         us)
             echo "dvorak" > "$fn"
             layout="dvorak"
+	    setxkbmap us -variant $layout -option ctrl:nocaps
             ;;
         dvorak)
             echo "us" > "$fn"
             layout="us"
+	    setxkbmap us -option ctrl:nocaps
             ;;
     esac
 fi
 
 notify-send -u normal -r 161616 "kbswitcher" "Keyboard layout set to $layout."
-
-switchkb $layout