diff --git a/etc/soft/nvim/+plugins_disabled/vim-haskellConceal/README b/etc/soft/nvim/+plugins/vim-haskellConceal/README
similarity index 100%
rename from etc/soft/nvim/+plugins_disabled/vim-haskellConceal/README
rename to etc/soft/nvim/+plugins/vim-haskellConceal/README
diff --git a/etc/soft/nvim/+plugins_disabled/vim-haskellConceal/after/syntax/haskell.vim b/etc/soft/nvim/+plugins/vim-haskellConceal/after/syntax/haskell.vim
similarity index 100%
rename from etc/soft/nvim/+plugins_disabled/vim-haskellConceal/after/syntax/haskell.vim
rename to etc/soft/nvim/+plugins/vim-haskellConceal/after/syntax/haskell.vim
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/README.md b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/README.md
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/README.md
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/README.md
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/after/syntax/haskell.vim b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/after/syntax/haskell.vim
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/after/syntax/haskell.vim
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/after/syntax/haskell.vim
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/after/syntax/lhaskell.vim b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/after/syntax/lhaskell.vim
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/after/syntax/lhaskell.vim
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/after/syntax/lhaskell.vim
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.hs b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.hs
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.hs
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.hs
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.lhs b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.lhs
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.lhs
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.lhs
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.png b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.png
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/demo.png
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/demo.png
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/gendemo.sh b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/gendemo.sh
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/gendemo.sh
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/gendemo.sh
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/tests/test-with-pack.sh b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/tests/test-with-pack.sh
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/tests/test-with-pack.sh
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/tests/test-with-pack.sh
diff --git a/etc/soft/nvim/+plugins/vim-haskellConcealPlus/tests/test-with-pathogen.sh b/etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/tests/test-with-pathogen.sh
similarity index 100%
rename from etc/soft/nvim/+plugins/vim-haskellConcealPlus/tests/test-with-pathogen.sh
rename to etc/soft/nvim/+plugins_disabled/vim-haskellConcealPlus/tests/test-with-pathogen.sh
diff --git a/etc/soft/nvim/syntax/haskell.vim b/etc/soft/nvim/syntax/haskell.vim
index 95939b9..e5ca440 100644
--- a/etc/soft/nvim/syntax/haskell.vim
+++ b/etc/soft/nvim/syntax/haskell.vim
@@ -60,20 +60,20 @@ syn match hsConditional	"\<\(if\|then\|else\)\>"
 
 
 " Types
-" syn keyword hsType	Array
-" syn keyword hsType	Bool BufferMode
-" syn keyword hsType	CalendarTime Char ClockTime Complex Complex
-" syn keyword hsType	Day Double
-" syn keyword hsType	Either ExitCode
-" syn keyword hsType	FilePath Float
-" syn keyword hsType	Handle HandlePosn
-" syn keyword hsType	Int Integer IO IOError IOMode
-" syn keyword hsType	Maybe Month
-" syn keyword hsType	Ordering
-" syn keyword hsType	Permissions
-" syn keyword hsType	Ratio Rational Rational Read ReadS
-" syn keyword hsType	SeekMode Show ShowS StdGen String
-" syn keyword hsType	TimeDiff TimeLocale
+syn keyword hsType	Array
+syn keyword hsType	Bool BufferMode
+syn keyword hsType	CalendarTime Char ClockTime Complex Complex
+syn keyword hsType	Day Double
+syn keyword hsType	Either ExitCode
+syn keyword hsType	FilePath Float
+syn keyword hsType	Handle HandlePosn
+syn keyword hsType	Int Integer IO IOError IOMode
+syn keyword hsType	Maybe Month
+syn keyword hsType	Ordering
+syn keyword hsType	Permissions
+syn keyword hsType	Ratio Rational Rational Read ReadS
+syn keyword hsType	SeekMode Show ShowS StdGen String
+syn keyword hsType	TimeDiff TimeLocale
 
 
 " Classes from the standard prelude