diff --git a/.gitignore b/.gitignore
index e0ab63ea..cca59d62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 vim/bundle/
+vimperator/info/
 tmp/
 Gemfile.lock
diff --git a/vimperator/info/default/history-command b/vimperator/info/default/history-command
deleted file mode 100644
index b1e2e6be..00000000
--- a/vimperator/info/default/history-command
+++ /dev/null
@@ -1 +0,0 @@
-[{"value":"tabopen vimperator hide address bar","timestamp":1421701531445,"privateData":true},{"value":"set gui=nonavigation","timestamp":1421701547481,"privateData":false},{"value":"open twilight userstyle","timestamp":1421701600350,"privateData":true},{"value":"open crunchbang userstyle twilight","timestamp":1421701644091,"privateData":true},{"value":"tabopen firefox appearance themes","timestamp":1421701977870,"privateData":true},{"value":"open vimperator font size","timestamp":1421702099284,"privateData":true},{"value":"hi CmdLine -append font-size:12px","timestamp":1421702131417,"privateData":false},{"value":"open vimperator font","timestamp":1421702147210,"privateData":true},{"value":"open vimperator settings","timestamp":1421702292000,"privateData":true},{"value":"hi -a CmdLine font-family: \"Terminus (TTF)\";","timestamp":1421702412246,"privateData":false},{"value":"open vimperator terminus","timestamp":1421702509992,"privateData":true},{"value":"open vimperator documentation","timestamp":1421702731370,"privateData":true},{"value":"open vimperator color schemes","timestamp":1421702835728,"privateData":true},{"value":"hi CmdLine font-family: \"Terminus (TTF)\";","timestamp":1421703022140,"privateData":false},{"value":"hi CmdLine font-family: \"terminus\";","timestamp":1421703034149,"privateData":false},{"value":"hi CmdLine font-family: \"terminus12\";","timestamp":1421703038892,"privateData":false},{"value":"hi CmdLine font-family: \"Terminus \\(TTF\\)\";","timestamp":1421703049286,"privateData":false},{"value":"hi CmdLine font-family: \"Terminus\";","timestamp":1421703116990,"privateData":false},{"value":"hi CmdLine font-family: terminus;","timestamp":1421703122582,"privateData":false},{"value":"hi CmdLine font-family: terminus, monospace;","timestamp":1421703134646,"privateData":false},{"value":"open vimperator change font","timestamp":1421703144620,"privateData":true},{"value":"colo pha","timestamp":1421703260481,"privateData":false},{"value":"colo phallus","timestamp":1421703305982,"privateData":false},{"value":"open http://192.168.1.100:32400/web/index.html#!/server/3a17d3ebe7612550817633945d97dab7d2ebc832/details/%2Flibrary%2Fmetadata%2F485","timestamp":1421703379460,"privateData":true},{"value":"open test","timestamp":1421703422004,"privateData":true},{"value":"buffer! ple","timestamp":1421703436254,"privateData":false},{"value":"open http://msdn.microsoft.com/en-us/magazine/hh386352.aspx","timestamp":1421703537962,"privateData":true},{"value":"open https://mathiasbynens.be/notes/javascript-encoding","timestamp":1421703542727,"privateData":true},{"value":"winopen http://www.smashingmagazine.com/2013/07/25/introduction-to-photoshop-scripting/","timestamp":1421704204560,"privateData":true},{"value":"tabopen http://www.ludumdare.com/compo/","timestamp":1421704223300,"privateData":true},{"value":"set gui+=mT","timestamp":1421706941672,"privateData":false},{"value":"set guioptions+=mT","timestamp":1421706947674,"privateData":false},{"value":"set guioptions-=T","timestamp":1421706951383,"privateData":false},{"value":"m","timestamp":1421708200630},{"value":"open redtube.com","timestamp":1421708297764,"privateData":true},{"value":"open http://my.ryerson.ca/","timestamp":1421719181345,"privateData":true},{"value":"open write to iterm2","timestamp":1421721854760,"privateData":true},{"value":"tabopen tmux shrink pane","timestamp":1421721891563,"privateData":true},{"value":"open io.local:5757","timestamp":1421722770550,"privateData":true},{"value":"open equidev.net/wp-admin","timestamp":1421722787094,"privateData":true},{"value":"open /wp-admin","timestamp":1421722831797,"privateData":true},{"value":"open io.local:5757/wp-admin","timestamp":1421722862388,"privateData":true},{"value":"open http://io.local:5757/wp-admin","timestamp":1421722877005,"privateData":true},{"value":"open allan.lissner.net","timestamp":1421722890175,"privateData":true},{"value":"open wp_get_content","timestamp":1421723155625,"privateData":true},{"value":"tabopen wordpress extract from post","timestamp":1421723180526,"privateData":true},{"value":"open wordpress extract video from post","timestamp":1421723235109,"privateData":true},{"value":"open wp get video","timestamp":1421723256493,"privateData":true},{"value":"open pinky pondering what are the chances","timestamp":1421724962099,"privateData":true},{"value":"open userstyles firefox","timestamp":1421725234563,"privateData":true},{"value":"open adobe cc scripts","timestamp":1421727777847,"privateData":true},{"value":"downloads","timestamp":1421727809283,"privateData":false},{"value":"open indesign scripting","timestamp":1421728483867,"privateData":true},{"value":"open equidev.net","timestamp":1421730679464,"privateData":true},{"value":"open http://equidev.net/favicon.png","timestamp":1421730684053,"privateData":true},{"value":"open http://equidev.net/favicon.ico","timestamp":1421730690474,"privateData":true},{"value":"open http://equidev.net/","timestamp":1421730694480,"privateData":true},{"value":"tabopen http://equidev.net/wp-content/themes/equidev-dev/favicon.png","timestamp":1421730745331,"privateData":true},{"value":"tabopen -private","timestamp":1421730833943,"privateData":true},{"value":"winopen -private","timestamp":1421730843664,"privateData":true},{"value":"open istock delete account","timestamp":1421733061290,"privateData":true},{"value":"open animepaper.net","timestamp":1421733440910,"privateData":true},{"value":"open https://accounts.icontem.com","timestamp":1421733612538,"privateData":true},{"value":"open https://icontem.com/","timestamp":1421733617666,"privateData":true},{"value":"open http://icontem.com/","timestamp":1421733623606,"privateData":true},{"value":"winopen derpmail","timestamp":1421733772687,"privateData":true},{"value":"open temporary email","timestamp":1421733783345,"privateData":true},{"value":"open temporary email address","timestamp":1421733888169,"privateData":true},{"value":"tabopen gmail.com","timestamp":1421734036559,"privateData":true},{"value":"open gmail","timestamp":1421734047156,"privateData":true},{"value":"open about:config","timestamp":1421734901572,"privateData":true},{"value":"tabopen firefox beta","timestamp":1421735280777,"privateData":true},{"value":"tabopen http://www.deviantart.com/","timestamp":1421735511920,"privateData":true},{"value":"tabopen https://github.com/","timestamp":1421735674987,"privateData":true},{"value":"open http://xkcd.com/","timestamp":1421735963187,"privateData":true},{"value":"open http://www.deviantart.com/","timestamp":1421737154307,"privateData":true},{"value":"open speed up firefox","timestamp":1421737859887,"privateData":true},{"value":"winopen ","timestamp":1421738405156,"privateData":true},{"value":"open http://forums.obdev.at/viewforum.php?f=24","timestamp":1421738485662,"privateData":true},{"value":"tabopen gmplib.org","timestamp":1421739315297,"privateData":true},{"value":"open commandline calculator","timestamp":1421739364122,"privateData":true},{"value":"open python scipy","timestamp":1421739469052,"privateData":true},{"value":"tabopen firefox tabs launchbar","timestamp":1421739638189,"privateData":true},{"value":"open firefox api terminal","timestamp":1421739747909,"privateData":true},{"value":"open list of firefox tabs api","timestamp":1421739786603,"privateData":true},{"value":"open firefox list tabs applescript","timestamp":1421739936197,"privateData":true}]
\ No newline at end of file
diff --git a/vimperator/info/default/history-search b/vimperator/info/default/history-search
deleted file mode 100644
index 0637a088..00000000
--- a/vimperator/info/default/history-search
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/vimperator/info/default/ignored-keys b/vimperator/info/default/ignored-keys
deleted file mode 100644
index 9e26dfee..00000000
--- a/vimperator/info/default/ignored-keys
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/vimperator/info/default/local-marks b/vimperator/info/default/local-marks
deleted file mode 100644
index f7cd7501..00000000
--- a/vimperator/info/default/local-marks
+++ /dev/null
@@ -1 +0,0 @@
-{"'":[{"location":"http://www.deviantart.com/messages/#view=feedback","position":{"x":0,"y":0.9809264305177112}}]}
\ No newline at end of file
diff --git a/vimperator/info/default/macros b/vimperator/info/default/macros
deleted file mode 100644
index 9e26dfee..00000000
--- a/vimperator/info/default/macros
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/vimperator/info/default/quickmarks b/vimperator/info/default/quickmarks
deleted file mode 100644
index 9e26dfee..00000000
--- a/vimperator/info/default/quickmarks
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/vimperatorrc b/vimperatorrc
index ce07af5c..082e02cb 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -1,11 +1,28 @@
+set editor=/Application/MacVim.app
+set animations
+set focuscontent
 set gui=nonavigation
 " Only use characters that don't suck to press.
 set hintchars="asdfghjkl;'"
 
+" Make hints look a lil nicer.
+hi Hint font-family: "Ubuntu Mono";
+hi -a Hint border: 1px solid black;
+hi -a Hint padding: 1px 1px 0 1px;
+hi -a Hint color: black;
+hi -a Hint background-color: #fffcc8;
+hi -a Hint font-size: 14px;
+hi HintActive background-color: rgba(0,0,0,0) !important;
+hi HintElem background-color: rgba(0,0,0,0) !important;
+
 noremap j 5j
 noremap k 5k
+noremap J <C-d>
+noremap K <C-u>
 
-hi CmdLine font-family: "Terminus"; font-size: 14px;
+hi CmdLine font-family: "Ubuntu Mono";
+hi -a CmdLine font-size: 14px;
+hi -a CmdLine padding: 4px 0 0;
 
 " Get my damn focus back
 autocmd PageLoad (www\\.youtube|groups.google)\\.com :normal <Esc>"