# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1348768645 14400
# Node ID efc8b9162ff8a58f08bc53557342165824d752d6
# Parent  17a20241905894d9c5e8c14456ced2a83507a470
Moar.

diff -r 17a202419058 -r efc8b9162ff8 keyremap4macbook/private.xml
--- a/keyremap4macbook/private.xml	Tue Sep 25 11:20:41 2012 -0400
+++ b/keyremap4macbook/private.xml	Thu Sep 27 13:57:25 2012 -0400
@@ -19,6 +19,1022 @@
                     ModifierFlag::OPTION_L | ModifierFlag::SHIFT_L | ModifierFlag::CONTROL_L
                 </autogen>
             </item>
+            <item>
+                <name>Math Layer</name>
+                <appendix>Right Control key activates the Math key layer.</appendix>
+
+                <identifier>space_cadet.math_layer</identifier>
+
+                <autogen>
+                    --KeyToKey--
+                        KeyCode::CONTROL_R,
+                        KeyCode::VK_STICKY_EXTRA3
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::A, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::A, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::C, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::C, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::E, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::E, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::F, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::I, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::I, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::N, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::O, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::R, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::R, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::T, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::T, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::U, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::X, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Z, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::MINUS, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::EQUAL, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::EQUAL, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::SLASH, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::F, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::COMMA, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::DOT, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::DOT, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::KEY_0, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::KEY_8, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BACKQUOTE, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_LEFT, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_LEFT, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_LEFT, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_LEFT, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_RIGHT, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_RIGHT, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_RIGHT, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::BRACKET_RIGHT, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_RIGHT, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::F, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_RIGHT, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_RIGHT, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_RIGHT, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_LEFT, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_LEFT, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_LEFT, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_LEFT, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_UP, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_UP, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_UP, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_UP, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_DOWN, ModifierFlag::EXTRA3 | VK_CONTROL | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_DOWN, ModifierFlag::EXTRA3 | VK_SHIFT,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_DOWN, ModifierFlag::EXTRA3 | VK_CONTROL,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::CURSOR_DOWN, ModifierFlag::EXTRA3,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+            </item>
+            <item>
+                <name>Greek Layer</name>
+                <appendix>Right PC Application key activates the Greek key layer.</appendix>
+
+                <identifier>space_cadet.greek_layer</identifier>
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::PC_APPLICATION,
+                    KeyCode::VK_STICKY_EXTRA4
+                </autogen>
+
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::A, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::A, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::B, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::B, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::C, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::C, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::D, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::D, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::E, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::E, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::F, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::F, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::G, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::G, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::H, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::H, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_7, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::I, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::I, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::J, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::J, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::K, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::K, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::L, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::L, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::M, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::M, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::N, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::N, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::D, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::O, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::F, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::O, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::F, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::P, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::P, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Q, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Q, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::R, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::R, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_1, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::S, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::S, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::T, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::T, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_4, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::U, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::U, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_5, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::V, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::V, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_2, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::W, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::W, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::X, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::X, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::E, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Y, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::A, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Y, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::C, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_8, ModifierFlag::OPTION_L,
+                </autogen>
+
+
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Z, ModifierFlag::EXTRA4 | VK_SHIFT,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_9, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                </autogen>
+                <autogen>
+                    --KeyToKey--
+                    KeyCode::Z, ModifierFlag::EXTRA4,
+                    KeyCode::KEY_0, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_3, ModifierFlag::OPTION_L,
+                    KeyCode::B, ModifierFlag::OPTION_L,
+                    KeyCode::KEY_6, ModifierFlag::OPTION_L,
+                </autogen>
+
+            </item>
         </item>
     </list>
 
diff -r 17a202419058 -r efc8b9162ff8 moom/com.manytricks.Moom.plist
Binary file moom/com.manytricks.Moom.plist has changed
diff -r 17a202419058 -r efc8b9162ff8 vim/vimrc
--- a/vim/vimrc	Tue Sep 25 11:20:41 2012 -0400
+++ b/vim/vimrc	Thu Sep 27 13:57:25 2012 -0400
@@ -76,10 +76,8 @@
 
 augroup cline
     au!
-    au WinLeave * set nocursorline
-    au WinEnter * set cursorline
-    au InsertEnter * set nocursorline
-    au InsertLeave * set cursorline
+    au WinLeave,InsertEnter * set nocursorline
+    au WinEnter,InsertLeave * set cursorline
 augroup END
 
 " }}}
@@ -245,9 +243,6 @@
 nnoremap <c-z> zvzz
 vnoremap <c-z> <esc>zv`<ztgv
 
-" Unfuck my screen
-nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
-
 " Tabs
 nnoremap <leader>( :tabprev<cr>
 nnoremap <leader>) :tabnext<cr>
@@ -327,10 +322,6 @@
 " HTML tag closing
 inoremap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
-" Cmdheight switching
-nnoremap <leader>1 :set cmdheight=1<cr>
-nnoremap <leader>2 :set cmdheight=2<cr>
-
 " Source
 vnoremap <leader>S y:execute @@<cr>:echo 'Sourced selection.'<cr>
 nnoremap <leader>S ^vg_y:execute @@<cr>:echo 'Sourced line.'<cr>
@@ -372,9 +363,6 @@
 " Toggle [i]nvisible characters
 nnoremap <leader>i :set list!<cr>
 
-" Has to be an autocommand because repeat.vim eats the mapping otherwise :(
-au VimEnter * :nnoremap U <c-r>
-
 " Drag Lines {{{
 
 " <m-j> and <m-k> to drag lines in any mode
@@ -835,9 +823,9 @@
     au BufNewFile,BufRead *.m*down setlocal filetype=markdown
 
     " Use <localleader>1/2/3 to add headings.
-    au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=
-    au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-
-    au Filetype markdown nnoremap <buffer> <localleader>3 I### <ESC>
+    au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
+    au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
+    au Filetype markdown nnoremap <buffer> <localleader>3 mzI### `zllll <ESC>
 augroup END
 
 " }}}
@@ -936,10 +924,10 @@
 augroup ft_rest
     au!
 
-    au Filetype rst nnoremap <buffer> <localleader>1 yypVr=
-    au Filetype rst nnoremap <buffer> <localleader>2 yypVr-
-    au Filetype rst nnoremap <buffer> <localleader>3 yypVr~
-    au Filetype rst nnoremap <buffer> <localleader>4 yypVr`
+    au Filetype rst nnoremap <buffer> <localleader>1 yypVr=:redraw<cr>
+    au Filetype rst nnoremap <buffer> <localleader>2 yypVr-:redraw<cr>
+    au Filetype rst nnoremap <buffer> <localleader>3 yypVr~:redraw<cr>
+    au Filetype rst nnoremap <buffer> <localleader>4 yypVr`:redraw<cr>
 augroup END
 
 " }}}
@@ -1052,7 +1040,9 @@
     \ "cd %s && git ls-files --exclude-standard -co | " .
     \ ctrlp_filter_greps
 
-let g:ctrlp_user_command = ['.git/', my_ctrlp_git_command, my_ctrlp_user_command]
+let my_ctrlp_ffind_command = "ffind --semi-restricted --dir %s --type e -B -f"
+
+let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_user_command]
 
 nnoremap <leader>. :CtrlPTag<cr>
 
@@ -1319,6 +1309,10 @@
 
     " Don't clobber the yank register when pasting over text in visual mode.
     vnoremap p :<c-u>YRPaste 'p', 'v'<cr>gv:YRYankRange 'v'<cr>
+
+    " Unfuck my screen
+    " nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
+    nnoremap U :syntax sync fromstart<cr>:redraw!<cr>
 endfunction
 
 " }}}
@@ -1438,7 +1432,7 @@
 " Diffwhite Toggle {{{
 
 set diffopt-=iwhite
-let g:diffwhitespaceon = 1
+let g:diffwhitespaceon = 0
 function! ToggleDiffWhitespace()
     if g:diffwhitespaceon
         set diffopt-=iwhite
@@ -1482,13 +1476,6 @@
 nmap <silent> <f4> :QFixToggle<cr>
 
 " }}}
-" Fake Paredit {{{
-
-" TODO: Make this stuff not suck.
-nnoremap <leader>> xEp
-nnoremap <leader>< xgEp
-
-" }}}
 " Nyan! {{{
 
 function! NyanMe() " {{{