diff --git a/dist/build/Yi/Lexer/Abella.hs b/dist/build/Yi/Lexer/Abella.hs
--- a/dist/build/Yi/Lexer/Abella.hs
+++ b/dist/build/Yi/Lexer/Abella.hs
@@ -107,7 +107,55 @@
 alex_action_16 =  c Unrecognized 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/C.hs b/dist/build/Yi/Lexer/C.hs
--- a/dist/build/Yi/Lexer/C.hs
+++ b/dist/build/Yi/Lexer/C.hs
@@ -85,7 +85,55 @@
 alex_action_19 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Cabal.hs b/dist/build/Yi/Lexer/Cabal.hs
--- a/dist/build/Yi/Lexer/Cabal.hs
+++ b/dist/build/Yi/Lexer/Cabal.hs
@@ -81,7 +81,55 @@
 alex_action_16 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Compilation.hs b/dist/build/Yi/Lexer/Compilation.hs
--- a/dist/build/Yi/Lexer/Compilation.hs
+++ b/dist/build/Yi/Lexer/Compilation.hs
@@ -64,7 +64,55 @@
      in (st, Report (fst $ arr!1) (read $ fst $ arr!2) 0 (fst $ arr!3)) 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Cplusplus.hs b/dist/build/Yi/Lexer/Cplusplus.hs
--- a/dist/build/Yi/Lexer/Cplusplus.hs
+++ b/dist/build/Yi/Lexer/Cplusplus.hs
@@ -82,7 +82,55 @@
 alex_action_17 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/GNUMake.hs b/dist/build/Yi/Lexer/GNUMake.hs
--- a/dist/build/Yi/Lexer/GNUMake.hs
+++ b/dist/build/Yi/Lexer/GNUMake.hs
@@ -119,7 +119,55 @@
 alex_action_30 =  c Style.commentStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/GitCommit.hs b/dist/build/Yi/Lexer/GitCommit.hs
--- a/dist/build/Yi/Lexer/GitCommit.hs
+++ b/dist/build/Yi/Lexer/GitCommit.hs
@@ -98,7 +98,55 @@
 alex_action_23 =  c Style.defaultStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Haskell.hs b/dist/build/Yi/Lexer/Haskell.hs
--- a/dist/build/Yi/Lexer/Haskell.hs
+++ b/dist/build/Yi/Lexer/Haskell.hs
@@ -208,7 +208,55 @@
 alex_action_52 =  c Unrecognized 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/JSON.hs b/dist/build/Yi/Lexer/JSON.hs
--- a/dist/build/Yi/Lexer/JSON.hs
+++ b/dist/build/Yi/Lexer/JSON.hs
@@ -59,7 +59,55 @@
 alex_action_4 =  c defaultStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Java.hs b/dist/build/Yi/Lexer/Java.hs
--- a/dist/build/Yi/Lexer/Java.hs
+++ b/dist/build/Yi/Lexer/Java.hs
@@ -84,7 +84,55 @@
 alex_action_18 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/JavaScript.hs b/dist/build/Yi/Lexer/JavaScript.hs
--- a/dist/build/Yi/Lexer/JavaScript.hs
+++ b/dist/build/Yi/Lexer/JavaScript.hs
@@ -232,7 +232,55 @@
 alex_action_21 =  c $ Comment Text 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Latex.hs b/dist/build/Yi/Lexer/Latex.hs
--- a/dist/build/Yi/Lexer/Latex.hs
+++ b/dist/build/Yi/Lexer/Latex.hs
@@ -400,7 +400,55 @@
 alex_action_7 =  c $ Text 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/LiterateHaskell.hs b/dist/build/Yi/Lexer/LiterateHaskell.hs
--- a/dist/build/Yi/Lexer/LiterateHaskell.hs
+++ b/dist/build/Yi/Lexer/LiterateHaskell.hs
@@ -140,7 +140,55 @@
 alex_action_81 =  c Unrecognized 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/OCaml.hs b/dist/build/Yi/Lexer/OCaml.hs
--- a/dist/build/Yi/Lexer/OCaml.hs
+++ b/dist/build/Yi/Lexer/OCaml.hs
@@ -93,7 +93,55 @@
 alex_action_16 =  c Operator 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/ObjectiveC.hs b/dist/build/Yi/Lexer/ObjectiveC.hs
--- a/dist/build/Yi/Lexer/ObjectiveC.hs
+++ b/dist/build/Yi/Lexer/ObjectiveC.hs
@@ -83,7 +83,55 @@
 alex_action_17 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Ott.hs b/dist/build/Yi/Lexer/Ott.hs
--- a/dist/build/Yi/Lexer/Ott.hs
+++ b/dist/build/Yi/Lexer/Ott.hs
@@ -90,7 +90,55 @@
 alex_action_28 =  c defaultStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Perl.hs b/dist/build/Yi/Lexer/Perl.hs
--- a/dist/build/Yi/Lexer/Perl.hs
+++ b/dist/build/Yi/Lexer/Perl.hs
@@ -294,7 +294,55 @@
 alex_action_62 =  c stringStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Python.hs b/dist/build/Yi/Lexer/Python.hs
--- a/dist/build/Yi/Lexer/Python.hs
+++ b/dist/build/Yi/Lexer/Python.hs
@@ -66,7 +66,55 @@
 alex_action_9 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Ruby.hs b/dist/build/Yi/Lexer/Ruby.hs
--- a/dist/build/Yi/Lexer/Ruby.hs
+++ b/dist/build/Yi/Lexer/Ruby.hs
@@ -71,7 +71,55 @@
 alex_action_14 =  c operatorStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/SVNCommit.hs b/dist/build/Yi/Lexer/SVNCommit.hs
--- a/dist/build/Yi/Lexer/SVNCommit.hs
+++ b/dist/build/Yi/Lexer/SVNCommit.hs
@@ -71,7 +71,55 @@
 alex_action_5 =  c Style.commentStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 8 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 8 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Srmc.hs b/dist/build/Yi/Lexer/Srmc.hs
--- a/dist/build/Yi/Lexer/Srmc.hs
+++ b/dist/build/Yi/Lexer/Srmc.hs
@@ -83,7 +83,55 @@
 alex_action_11 =  c keywordStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/dist/build/Yi/Lexer/Whitespace.hs b/dist/build/Yi/Lexer/Whitespace.hs
--- a/dist/build/Yi/Lexer/Whitespace.hs
+++ b/dist/build/Yi/Lexer/Whitespace.hs
@@ -66,7 +66,55 @@
 alex_action_3 =  c commentStyle 
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
+{-# LINE 1 "<built-in>" #-}
 {-# LINE 1 "<command-line>" #-}
+{-# LINE 9 "<command-line>" #-}
+# 1 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 1 3 4
+
+# 17 "/nix/store/94n64qy99ja0vgbkf675nyk39g9b978n-glibc-2.19/include/stdc-predef.h" 3 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{-# LINE 9 "<command-line>" #-}
 {-# LINE 1 "templates/GenericTemplate.hs" #-}
 -- -----------------------------------------------------------------------------
 -- ALEX TEMPLATE
diff --git a/src/library/Yi/UI/Pango.hs b/src/library/Yi/UI/Pango.hs
--- a/src/library/Yi/UI/Pango.hs
+++ b/src/library/Yi/UI/Pango.hs
@@ -19,6 +19,7 @@
 import Control.Applicative
 import Control.Lens hiding (set, Action, from)
 import Data.Prototype
+import Data.Text (unpack, Text)
 import Data.IORef
 import Data.List (intercalate)
 import qualified Data.List.PointedList as PL (moveTo)
@@ -162,7 +163,7 @@
 start :: UIBoot
 start cfg ch outCh ed =
   catch (startNoMsg cfg ch outCh ed)
-  (\(GError _dom _code msg) -> fail msg)
+  (\(GError _dom _code msg) -> fail $ unpack msg)
 
 startNoMsg :: UIBoot
 startNoMsg cfg ch outCh ed = do
@@ -177,7 +178,9 @@
   imContextSetUsePreedit im False  -- handler for preedit string not implemented
 
   -- Yi.Buffer.Misc.insertN for atomic input?
-  im `on` imContextCommit $ mapM_ (\k -> ch $ Event (KASCII k) [])
+  let imContextCommitS :: Signal IMContext (String -> IO ())
+      imContextCommitS = imContextCommit
+  im `on` imContextCommitS $ mapM_ (\k -> ch $ Event (KASCII k) [])
 
   set win [ windowDefaultWidth  := 700
           , windowDefaultHeight := 900
@@ -355,7 +358,7 @@
     let b = findBufferWith (bufkey w) e
     f <- readIORef (uiFont ui)
 
-    ml <- labelNew Nothing
+    ml <- labelNew (Nothing :: Maybe Text)
     widgetModifyFont ml (Just f)
     set ml [ miscXalign := 0.01 ] -- so the text is left-justified.
 
@@ -611,11 +614,12 @@
 updatePango ui font w b layout = do
   (width_', height') <- widgetGetSize $ textview w
   let width' = max 0 (width_' - 1) -- see Note [PangoLayout width]
-
+      fontDescriptionToStringT :: FontDescription -> IO Text
+      fontDescriptionToStringT = fontDescriptionToString
   oldFont <- layoutGetFontDescription layout
   oldFontStr <- maybe (return Nothing)
-                (fmap Just . fontDescriptionToString) oldFont
-  newFontStr <- Just <$> fontDescriptionToString font
+                (fmap Just . fontDescriptionToStringT) oldFont
+  newFontStr <- Just <$> fontDescriptionToStringT font
   when (oldFontStr /= newFontStr) (layoutSetFontDescription layout (Just font))
 
   win <- readIORef (coreWin w)
@@ -825,37 +829,3 @@
   txt <- readIORef selection
 
   unless (null txt) $ clipboardSetText cb txt
-
-
-
--- Some useful stuff from `startNoMsg`
---
--- Disable the left pane (file/module browser) until Shim/Scion discussion has
--- concluded. Shim causes crashes, but it's not worth fixing if we'll soon
--- replace it.
-
-{-
-tabs' <- notebookNew
-widgetSetSizeRequest tabs' 200 (-1)
-notebookSetTabPos tabs' PosBottom
-panedAdd1 paned tabs'
-
--- Create the tree views for files and modules
-(filesProject, modulesProject) <- loadProject =<< getCurrentDirectory
-
-filesStore   <- treeStoreNew [filesProject]
-modulesStore <- treeStoreNew [modulesProject]
-
-filesTree   <- projectTreeNew (outCh . singleton) filesStore
-modulesTree <- projectTreeNew (outCh . singleton) modulesStore
-
-scrlProject <- scrolledWindowNew Nothing Nothing
-scrolledWindowAddWithViewport scrlProject filesTree
-scrolledWindowSetPolicy scrlProject PolicyAutomatic PolicyAutomatic
-notebookAppendPage tabs scrlProject "Project"
-
-scrlModules <- scrolledWindowNew Nothing Nothing
-scrolledWindowAddWithViewport scrlModules modulesTree
-scrolledWindowSetPolicy scrlModules PolicyAutomatic PolicyAutomatic
-notebookAppendPage tabs scrlModules "Modules"
--}
diff --git a/src/library/Yi/UI/Pango/Control.hs b/src/library/Yi/UI/Pango/Control.hs
--- a/src/library/Yi/UI/Pango/Control.hs
+++ b/src/library/Yi/UI/Pango/Control.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE RecordWildCards, ScopedTypeVariables, MultiParamTypeClasses
-           , DeriveDataTypeable
+           , DeriveDataTypeable, OverloadedStrings
            , GeneralizedNewtypeDeriving, FlexibleContexts #-}
 
 -- this module isn't finished, and there's heaps of warnings.
@@ -31,6 +31,7 @@
 ,   keyTable
 ) where
 
+import Data.Text (unpack, pack, Text)
 import Prelude hiding (concatMap, concat, foldl, elem, mapM_)
 import Control.Exception (catch)
 import Control.Monad        hiding (mapM_, forM_)
@@ -179,7 +180,8 @@
 
 start :: ControlM () -> UIBoot
 start main cfg ch outCh ed =
-  catch (startNoMsg main cfg ch outCh ed) (\(GError _dom _code msg) -> fail msg)
+  catch (startNoMsg main cfg ch outCh ed) (\(GError _dom _code msg) ->
+                                            fail $ unpack msg)
 
 makeControl :: MVar Control -> YiM ()
 makeControl controlMVar = do
@@ -206,7 +208,7 @@
     liftBase $ putStrLn "Yi Control Suspend"
     return ()
 
-{-# ANN refresh "HLint: ignore Redundant do" #-}
+{-# ANN refresh ("HLint: ignore Redundant do" :: String) #-}
 refresh :: Editor -> ControlM ()
 refresh e = do
     --contextId <- statusbarGetContextId (uiStatusbar ui) "global"
@@ -385,7 +387,7 @@
 --    cache <- syncWindows e t' (toList $ PL.withFocus ws) []
     return t' -- { views = cache }
 
-{-# ANN insertTabBefore "HLint: ignore Redundant do" #-}
+{-# ANN insertTabBefore ("HLint: ignore Redundant do" :: String) #-}
 insertTabBefore :: Editor -> Tab -> TabInfo -> ControlM TabInfo
 insertTabBefore e ws c = do
     -- Just p <- notebookPageNum (uiNotebook ui) (page c)
@@ -394,7 +396,7 @@
     -- widgetShowAll $ vb
     newTab e ws
 
-{-# ANN insertTab "HLint: ignore Redundant do" #-}
+{-# ANN insertTab ("HLint: ignore Redundant do" :: String) #-}
 insertTab :: Editor -> Tab -> ControlM TabInfo
 insertTab e ws = do
     -- vb <- vBoxNew False 1
@@ -494,7 +496,7 @@
     liftBase $ layoutSetFontDescription layout (Just font)
     language <- liftBase $ contextGetLanguage context
     metrics  <- liftBase $ contextGetMetrics context font language
-    liftBase $ layoutSetText layout ""
+    liftBase $ layoutSetText layout ("" :: Text)
 
     scrollWin <- liftBase $ scrolledWindowNew Nothing Nothing
     liftBase $ do
@@ -638,7 +640,7 @@
           us = view pendingUpdatesA fb
       in highlightSelectionA .~ (h && null us) $ fb
 
-{-# ANN setBufferMode "HLint: ignore Redundant do" #-}
+{-# ANN setBufferMode ("HLint: ignore Redundant do" :: String) #-}
 setBufferMode :: FilePath -> Buffer -> ControlM ()
 setBufferMode f buffer = do
     let bufRef = fBufRef buffer
@@ -646,7 +648,7 @@
     tbl <- liftYi $ asks (modeTable . yiConfig)
     contents <- liftYi $ withEditor $ withGivenBuffer0 bufRef elemsB
     let header = take 1024 contents
-        hmode = case header =~ "\\-\\*\\- *([^ ]*) *\\-\\*\\-" of
+        hmode = case header =~ ("\\-\\*\\- *([^ ]*) *\\-\\*\\-" :: String) of
             AllTextSubmatches [_,m] -> m
             _ -> ""
         Just mode = find (\(AnyMode m)-> modeName m == hmode) tbl <|>
@@ -830,7 +832,7 @@
 gtkToYiEvent _ = Nothing
 
 -- | Map GTK long names to Keys
-keyTable :: Map.Map String Key
+keyTable :: Map.Map Text Key
 keyTable = Map.fromList
     [("Down",       KDown)
     ,("Up",         KUp)
diff --git a/src/library/Yi/UI/Pango/Utils.hs b/src/library/Yi/UI/Pango/Utils.hs
--- a/src/library/Yi/UI/Pango/Utils.hs
+++ b/src/library/Yi/UI/Pango/Utils.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 --
 -- Copyright (c) Krasimir Angelov 2008.
 --
@@ -8,6 +9,7 @@
 
 import Control.Exception (catch, throw)
 
+import Data.Text (append)
 import Paths_yi
 import System.FilePath
 import Graphics.UI.Gtk
@@ -20,6 +22,6 @@
     catch (pixbufNewFromFile iconfile)
     (\(GError dom code msg) ->
       throw $ GError dom code $
-        msg ++ " -- use the yi_datadir environment variable to"
-            ++ " specify an alternate location")
+        msg `append` " -- use the yi_datadir environment variable to"
+            `append` " specify an alternate location")
   pixbufAddAlpha icoProject (Just (0,255,0))
diff --git a/yi.cabal b/yi.cabal
--- a/yi.cabal
+++ b/yi.cabal
@@ -1,5 +1,5 @@
 name:           yi
-version:        0.8.1
+version:        0.8.2
 category:       Development, Editor
 synopsis:       The Haskell-Scriptable Editor
 description:
@@ -246,6 +246,7 @@
     safe >= 0.3.4 && < 0.4,
     split >= 0.1 && < 0.3,
     template-haskell >= 2.4,
+    text,
     time >= 1.1 && < 1.5,
     utf8-string >= 0.3.1,
     uniplate,
@@ -288,9 +289,9 @@
       Yi.UI.Pango.Layouts
       Yi.UI.Pango.Utils
     build-depends:
-      gtk ==0.12.*,
-      glib ==0.12.*,
-      pango ==0.12.*
+      gtk ==0.13.*,
+      glib ==0.13.*,
+      pango ==0.13.*
     cpp-options: -DFRONTEND_PANGO
 
   if flag(vty)