xkb_keycodes { include "evdev" };
     xkb_types    { include "complete" };
     xkb_compat   { include "complete" };
-    xkb_symbols  { include "pc+inet(evdev)+dvorak+dvorak(kinesis)" };
-    xkb_geometry { include "kinesis(model100)" };
+    xkb_symbols  { 
+        include "pc+inet(evdev)+dvorak"
+        include "altwin(swap_alt_win)"
+        include "level3(menu_switch)"
+    };
+    xkb_geometry { include "pc(pc104)" };
 };