diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Tom Sydney Kerckhove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+yi-solarized
+============
+
+Solarized colour scheme for the Yi editor.
+
+Based on this palette:
+![yi-solarized](http://simianuprising.com/wp-content/uploads/2012/08/solarized-reference-horizontal.png "solarized")
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import           Distribution.Simple
+main = defaultMain
diff --git a/src/Yi/Style/Solarized.hs b/src/Yi/Style/Solarized.hs
new file mode 100644
--- /dev/null
+++ b/src/Yi/Style/Solarized.hs
@@ -0,0 +1,130 @@
+-- |
+-- Module      :  Yi.Style.Solarized
+-- Copyright   :  (c) Tom Sydney Kerckhove 2015
+-- License     :  MIT
+--
+-- Maintainer  :  syd.kerckhove@gmail.com
+-- Stability   :  experimental
+-- Portability :  portable
+
+module Yi.Style.Solarized ( solarizedTheme ) where
+
+import           Data.Bits   (shiftR)
+import           Data.Monoid (mappend, mempty)
+import           Data.Word   (Word32)
+import           Yi
+
+-- | The main theme specification. An example use in your @yi.hs@ might
+-- look something like
+--
+-- @
+-- main :: IO ()
+-- main = yi $ myConfig {
+--   defaultKm = defaultKm myConfig
+--   , startFrontEnd = start
+--   , configUI = (configUI defaultConfig) { configTheme = solarizedTheme }
+--   }
+-- @
+solarizedTheme :: Proto UIStyle
+solarizedTheme = defaultTheme `override` \sets _ -> sets
+  { baseAttributes     = emptyAttributes { foreground = solarizedBase1
+                                         , background = solarizedBase03
+                                         , reverseAttr = False }
+  , modelineAttributes = emptyAttributes { foreground = solarizedBase1
+                                         , background = solarizedBase03
+                                         , reverseAttr = False }
+  , tabBarAttributes   = emptyAttributes { foreground = solarizedBase1
+                                         , background = solarizedBase03
+                                         , reverseAttr = False }
+  , tabInFocusStyle    = withFg solarizedBase1 `mappend` withBg solarizedBase03
+  , selectedStyle      = withBg solarizedBase03
+  , hintStyle          = withBg solarizedBase03
+  , builtinStyle       = withFg solarizedCyan
+  , commentStyle       = withFg solarizedBase01
+  , keywordStyle       = withFg solarizedRed
+  , stringStyle        = withFg solarizedRed
+  , typeStyle          = withFg solarizedYellow
+  , errorStyle         = withFg solarizedRed `mappend` withBd True
+
+  , operatorStyle      = withFg solarizedBlue
+
+  , importStyle        = withFg solarizedGreen
+  , numberStyle        = withFg solarizedGreen
+  , preprocessorStyle  = withFg solarizedBase3
+
+  }
+
+
+-- | Convenience function
+rgb :: Word32 -> Color
+rgb x = RGB (fi (x `shiftR` 16))
+            (fi (x `shiftR` 8))
+            (fi x)
+  where
+    fi = fromIntegral
+
+
+-- | Hex value: 0x002B36
+solarizedBase03 :: Color
+solarizedBase03 = rgb 0x000000
+
+-- | Hex value: 0x073642
+solarizedBase02 :: Color
+solarizedBase02 = rgb 0x073642
+
+-- | Hex value: 0x586E75
+solarizedBase01 :: Color
+solarizedBase01 = rgb 0x586E75
+
+-- | Hex value: 0x657B83
+solarizedBase00 :: Color
+solarizedBase00 = rgb 0x657B83
+
+-- | Hex value: 0x839496
+solarizedBase0 :: Color
+solarizedBase0 = rgb 0x839496
+
+-- | Hex value: 0x93A1A1
+solarizedBase1 :: Color
+solarizedBase1 = rgb 0x93A1A1
+
+-- | Hex value: 0xEEE8d5
+solarizedBase2 :: Color
+solarizedBase2 = rgb 0xEEE8d5
+
+-- | Hex value: 0xFDF6e3
+solarizedBase3 :: Color
+solarizedBase3 = rgb 0xFDF6e3
+
+-- | Hex value: 0xB58900
+solarizedYellow :: Color
+solarizedYellow = rgb 0xB58900
+
+-- | Hex value: 0xCB4B16
+solarizedOrange :: Color
+solarizedOrange = rgb 0xCB4B16
+
+-- | Hex value: 0xDC322F
+solarizedRed :: Color
+solarizedRed = rgb 0xDC322F
+
+-- | Hex value: 0xD33682
+solarizedMagenta :: Color
+solarizedMagenta = rgb 0xD33682
+
+-- | Hex value: 0x6C71C4
+solarizedViolet :: Color
+solarizedViolet = rgb 0x6C71C4
+
+-- | Hex value: 0x268BD2
+solarizedBlue :: Color
+solarizedBlue = rgb 0x268BD2
+
+-- | Hex value: 0x2AA198
+solarizedCyan :: Color
+solarizedCyan = rgb 0x2AA198
+
+-- | Hex value: 0x859900
+solarizedGreen :: Color
+solarizedGreen = rgb 0x859900
+
diff --git a/yi-solarized.cabal b/yi-solarized.cabal
new file mode 100644
--- /dev/null
+++ b/yi-solarized.cabal
@@ -0,0 +1,25 @@
+name:                yi-solarized
+version:             0.1.0
+synopsis:            Monokai colour theme for the Yi text editor
+description:         Monokai colour theme for Yi. Check source for yi.hs usage.
+homepage:            https://github.com/Fuuzetsu/yi-monokai
+license:             MIT
+license-file:        LICENSE
+author:              Tom Sydney Kerckhove
+maintainer:          syd.kerckhove@gmail.com
+category:            Editor
+build-type:          Simple
+extra-source-files:  README.md
+cabal-version:       >=1.10
+source-repository head
+  type:     git
+  location: git@github.com:NorfairKing/yi-solarized.git
+
+library
+  hs-source-dirs:      src
+  default-language:    Haskell2010
+  exposed-modules:     Yi.Style.Solarized
+
+  build-depends:        base >=4.6 && <5
+                       ,yi >=0.8
+