diff --git a/devicon-colors.css b/devicon-colors.css
index f69a6a8d..5ae442c9 100644
--- a/devicon-colors.css
+++ b/devicon-colors.css
@@ -30,9 +30,13 @@
 .devicon-yarn-plain.colored {
   color: #2c8ebb;
 }
+.devicon-haskell-plain-wordmark.colored,
+.devicon-haskell-plain.colored{
+  color: #5E5185;
+}
 .devicon-handlebars-plain-wordmark.colored,
 .devicon-handlebars-plain.colored{
-  color: #000000;
+	color: #000000;
 }
 .devicon-couchdb-plain-wordmark.colored,
 .devicon-couchdb-plain.colored {
diff --git a/devicon.json b/devicon.json
index 02c9340d..9a8ab522 100644
--- a/devicon.json
+++ b/devicon.json
@@ -447,6 +447,14 @@
       "font": ["plain"]
     }
   },
+  {
+    "name": "haskell",
+    "tags": ["language", "functional"],
+    "versions": {
+      "svg": ["original", "original-wordmark", "plain", "plain-wordmark"],
+      "font": ["plain", "plain-wordmark"]
+    }
+  },
   {
     "name": "handlebars",
     "tags": ["framework"],
diff --git a/haskell/haskell-plain-workmark.svg b/haskell/haskell-plain-workmark.svg
deleted file mode 100644
index 4d8b8483..00000000
--- a/haskell/haskell-plain-workmark.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-opacity:0.937;}
-</style>
-<g id="Layer_1">
-</g>
-<g id="Layer_2">
-	<g id="XMLID_116_">
-		<path id="XMLID_129_" class="st0" d="M47.1,52.5v18.7h-5.1v-7.3h-6.3v7.3h-5.1V52.5h5.1v6.9h6.3v-6.9H47.1z M53.8,71.5
-			c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.5-1.6-0.9c-0.4-0.4-0.8-0.9-1-1.4C49.1,68.3,49,67.7,49,67c0-0.7,0.1-1.3,0.4-1.9
-			c0.3-0.6,0.7-1.1,1.2-1.5c0.5-0.4,1.2-0.7,1.9-1c0.7-0.2,1.5-0.3,2.4-0.3c1.1,0,2.1,0.2,2.8,0.5v-0.4c0-0.6-0.2-1.1-0.6-1.4
-			c-0.4-0.3-1-0.5-1.8-0.5c-0.8,0-1.5,0.1-2.2,0.4c-0.7,0.2-1.4,0.6-2.1,1.1l-1.4-3.1c1.8-1.2,3.9-1.8,6.2-1.8
-			c2.2,0,3.9,0.5,5.1,1.5c1.2,1,1.8,2.5,1.8,4.4v2.7c0,0.5,0.1,0.8,0.3,1c0.2,0.2,0.5,0.3,0.9,0.3v4.2c-0.5,0.1-0.9,0.1-1.3,0.2
-			c-0.4,0.1-0.8,0.1-1.1,0.1c-0.9,0-1.6-0.2-2.1-0.5c-0.5-0.3-0.8-0.8-0.9-1.4l-0.1-0.5c-0.6,0.8-1.3,1.4-2.1,1.8
-			C55.6,71.3,54.7,71.5,53.8,71.5L53.8,71.5z M55.3,67.9c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,0.8-0.4c0.2-0.1,0.4-0.3,0.5-0.4
-			c0.1-0.2,0.2-0.4,0.2-0.5v-1c-0.3-0.1-0.6-0.2-1-0.3c-0.4-0.1-0.7-0.1-0.9-0.1c-0.6,0-1.1,0.1-1.5,0.4c-0.4,0.3-0.6,0.7-0.6,1.1
-			c0,0.4,0.1,0.7,0.4,0.9C54.4,67.8,54.8,67.9,55.3,67.9L55.3,67.9z M71.8,71.5c-0.6,0-1.2,0-1.9-0.1c-0.7-0.1-1.3-0.2-2-0.3
-			c-0.6-0.1-1.2-0.3-1.8-0.5c-0.6-0.2-1.1-0.4-1.6-0.7l1.9-3.4c1,0.5,1.9,0.9,2.8,1.2c0.9,0.3,1.7,0.4,2.5,0.4
-			c0.9,0,1.3-0.2,1.3-0.7c0-0.2-0.2-0.4-0.5-0.6c-0.4-0.2-1-0.4-2-0.6c-1-0.3-1.8-0.5-2.5-0.8c-0.7-0.3-1.2-0.6-1.6-0.9
-			c-0.4-0.3-0.7-0.7-0.9-1.1c-0.2-0.4-0.3-0.9-0.3-1.4c0-0.7,0.1-1.4,0.4-1.9c0.3-0.6,0.7-1.1,1.2-1.6c0.5-0.4,1.1-0.8,1.9-1
-			c0.7-0.2,1.5-0.4,2.4-0.4c0.9,0,1.9,0.1,3,0.4c1.1,0.3,2.2,0.6,3.3,1.2l-1.9,3.2c-1-0.5-1.8-0.8-2.4-1c-0.6-0.2-1.3-0.3-1.9-0.3
-			c-0.4,0-0.7,0.1-0.9,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.3,0.1,0.4c0.1,0.1,0.2,0.2,0.4,0.3c0.2,0.1,0.4,0.2,0.7,0.3
-			c0.3,0.1,0.7,0.2,1.2,0.3c1.1,0.3,1.9,0.5,2.7,0.8c0.7,0.3,1.3,0.6,1.7,0.9c0.4,0.3,0.7,0.7,0.9,1.2c0.2,0.4,0.3,0.9,0.3,1.5
-			c0,1.4-0.5,2.5-1.6,3.4C75.1,71.1,73.7,71.5,71.8,71.5L71.8,71.5z M88.7,71.2l-3.1-5.1l-1,1.1v3.9h-5V52h5v10.5l3.7-5.1h5.3
-			l-4.8,6.1l5.2,7.8H88.7L88.7,71.2z"/>
-		<path id="XMLID_117_" class="st0" d="M101,71.5c-1.2,0-2.3-0.2-3.2-0.6c-0.9-0.4-1.7-0.9-2.4-1.6c-0.6-0.6-1.1-1.4-1.4-2.2
-			c-0.3-0.8-0.5-1.7-0.5-2.7c0-1,0.2-1.9,0.5-2.8c0.3-0.9,0.8-1.7,1.4-2.3c0.6-0.7,1.4-1.2,2.4-1.6c0.9-0.4,2-0.6,3.3-0.6
-			c1.2,0,2.3,0.2,3.3,0.6c0.9,0.4,1.7,0.9,2.4,1.6c0.6,0.6,1.1,1.4,1.4,2.3c0.3,0.9,0.5,1.8,0.5,2.7c0,0.3,0,0.5-0.1,0.8
-			c0,0.3,0,0.5-0.1,0.7h-9.7c0.1,0.7,0.3,1.3,0.8,1.6c0.5,0.3,1,0.5,1.6,0.5c0.5,0,1.1-0.1,1.5-0.4c0.5-0.2,0.8-0.6,1-1l4.2,1.2
-			c-0.6,1.1-1.4,2-2.6,2.7C104.1,71.1,102.7,71.5,101,71.5L101,71.5z M103.2,62.8c-0.1-0.7-0.3-1.2-0.7-1.6
-			c-0.4-0.4-0.9-0.6-1.6-0.6c-0.6,0-1.2,0.2-1.6,0.6c-0.4,0.4-0.6,0.9-0.7,1.6H103.2L103.2,62.8z M110.1,52h5v13.4
-			c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2
-			c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3L110.1,52L110.1,52z M119.7,52h5v13.4c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1
-			c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3
-			L119.7,52L119.7,52z"/>
-	</g>
-	<path id="XMLID_23_" d="M0,71.3l6.2-9.3L0,52.6h4.7l6.2,9.3l-6.2,9.3H0z"/>
-	<path id="XMLID_22_" d="M6.2,71.3l6.2-9.3l-6.2-9.3h4.7l12.5,18.7h-4.7l-3.9-5.8l-3.9,5.8H6.2z"/>
-	<path id="XMLID_111_" d="M21.3,65.8l-2.1-3.1h7.3v3.1L21.3,65.8L21.3,65.8z M18.2,61.1L16.1,58h10.4v3.1H18.2z"/>
-</g>
-</svg>
diff --git a/haskell/haskell-plain.svg b/haskell/haskell-plain.svg
deleted file mode 100644
index bdb8089c..00000000
--- a/haskell/haskell-plain.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<g id="Layer_1">
-	<path id="XMLID_9_" d="M0,110.2L30.1,65L0,19.9h22.6L52.7,65l-30.1,45.1H0z"/>
-	<path id="XMLID_8_" d="M30.1,110.2L60.2,65L30.1,19.9h22.6l60.2,90.3H90.4L71.5,81.9l-18.8,28.2H30.1z"/>
-	<path id="XMLID_1_" d="M102.9,83.8l-10-15.1H128v15.1L102.9,83.8L102.9,83.8z M87.8,61.3l-10-15.1H128v15.1H87.8z"/>
-</g>
-<g id="Layer_2">
-</g>
-</svg>
diff --git a/haskell/link.txt b/haskell/link.txt
deleted file mode 100644
index 89fa5a0b..00000000
--- a/haskell/link.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/konpa/devicon
\ No newline at end of file
diff --git a/haskell/haskell-original-workmark.svg b/icons/haskell/haskell-original-workmark.svg
similarity index 98%
rename from haskell/haskell-original-workmark.svg
rename to icons/haskell/haskell-original-workmark.svg
index ee85d187..6b73e178 100644
--- a/haskell/haskell-original-workmark.svg
+++ b/icons/haskell/haskell-original-workmark.svg
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#333333;fill-opacity:0.937;}
-	.st1{fill:#463B63;}
-	.st2{fill:#5E5187;}
-	.st3{fill:#904F8C;}
-</style>
-<g id="Layer_1">
-</g>
-<g id="Layer_2">
-	<g id="XMLID_116_">
-		<path id="XMLID_129_" class="st0" d="M47.1,52.5v18.7h-5.1v-7.3h-6.3v7.3h-5.1V52.5h5.1v6.9h6.3v-6.9H47.1z M53.8,71.5
-			c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.5-1.6-0.9c-0.4-0.4-0.8-0.9-1-1.4C49.1,68.3,49,67.7,49,67c0-0.7,0.1-1.3,0.4-1.9
-			c0.3-0.6,0.7-1.1,1.2-1.5c0.5-0.4,1.2-0.7,1.9-1c0.7-0.2,1.5-0.3,2.4-0.3c1.1,0,2.1,0.2,2.8,0.5v-0.4c0-0.6-0.2-1.1-0.6-1.4
-			c-0.4-0.3-1-0.5-1.8-0.5c-0.8,0-1.5,0.1-2.2,0.4c-0.7,0.2-1.4,0.6-2.1,1.1l-1.4-3.1c1.8-1.2,3.9-1.8,6.2-1.8
-			c2.2,0,3.9,0.5,5.1,1.5c1.2,1,1.8,2.5,1.8,4.4v2.7c0,0.5,0.1,0.8,0.3,1c0.2,0.2,0.5,0.3,0.9,0.3v4.2c-0.5,0.1-0.9,0.1-1.3,0.2
-			c-0.4,0.1-0.8,0.1-1.1,0.1c-0.9,0-1.6-0.2-2.1-0.5c-0.5-0.3-0.8-0.8-0.9-1.4l-0.1-0.5c-0.6,0.8-1.3,1.4-2.1,1.8
-			C55.6,71.3,54.7,71.5,53.8,71.5L53.8,71.5z M55.3,67.9c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,0.8-0.4c0.2-0.1,0.4-0.3,0.5-0.4
-			c0.1-0.2,0.2-0.4,0.2-0.5v-1c-0.3-0.1-0.6-0.2-1-0.3c-0.4-0.1-0.7-0.1-0.9-0.1c-0.6,0-1.1,0.1-1.5,0.4c-0.4,0.3-0.6,0.7-0.6,1.1
-			c0,0.4,0.1,0.7,0.4,0.9C54.4,67.8,54.8,67.9,55.3,67.9L55.3,67.9z M71.8,71.5c-0.6,0-1.2,0-1.9-0.1c-0.7-0.1-1.3-0.2-2-0.3
-			c-0.6-0.1-1.2-0.3-1.8-0.5c-0.6-0.2-1.1-0.4-1.6-0.7l1.9-3.4c1,0.5,1.9,0.9,2.8,1.2c0.9,0.3,1.7,0.4,2.5,0.4
-			c0.9,0,1.3-0.2,1.3-0.7c0-0.2-0.2-0.4-0.5-0.6c-0.4-0.2-1-0.4-2-0.6c-1-0.3-1.8-0.5-2.5-0.8c-0.7-0.3-1.2-0.6-1.6-0.9
-			c-0.4-0.3-0.7-0.7-0.9-1.1c-0.2-0.4-0.3-0.9-0.3-1.4c0-0.7,0.1-1.4,0.4-1.9c0.3-0.6,0.7-1.1,1.2-1.6c0.5-0.4,1.1-0.8,1.9-1
-			c0.7-0.2,1.5-0.4,2.4-0.4c0.9,0,1.9,0.1,3,0.4c1.1,0.3,2.2,0.6,3.3,1.2l-1.9,3.2c-1-0.5-1.8-0.8-2.4-1c-0.6-0.2-1.3-0.3-1.9-0.3
-			c-0.4,0-0.7,0.1-0.9,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.3,0.1,0.4c0.1,0.1,0.2,0.2,0.4,0.3c0.2,0.1,0.4,0.2,0.7,0.3
-			c0.3,0.1,0.7,0.2,1.2,0.3c1.1,0.3,1.9,0.5,2.7,0.8c0.7,0.3,1.3,0.6,1.7,0.9c0.4,0.3,0.7,0.7,0.9,1.2c0.2,0.4,0.3,0.9,0.3,1.5
-			c0,1.4-0.5,2.5-1.6,3.4C75.1,71.1,73.7,71.5,71.8,71.5L71.8,71.5z M88.7,71.2l-3.1-5.1l-1,1.1v3.9h-5V52h5v10.5l3.7-5.1h5.3
-			l-4.8,6.1l5.2,7.8H88.7L88.7,71.2z"/>
-		<path id="XMLID_117_" class="st0" d="M101,71.5c-1.2,0-2.3-0.2-3.2-0.6c-0.9-0.4-1.7-0.9-2.4-1.6c-0.6-0.6-1.1-1.4-1.4-2.2
-			c-0.3-0.8-0.5-1.7-0.5-2.7c0-1,0.2-1.9,0.5-2.8c0.3-0.9,0.8-1.7,1.4-2.3c0.6-0.7,1.4-1.2,2.4-1.6c0.9-0.4,2-0.6,3.3-0.6
-			c1.2,0,2.3,0.2,3.3,0.6c0.9,0.4,1.7,0.9,2.4,1.6c0.6,0.6,1.1,1.4,1.4,2.3c0.3,0.9,0.5,1.8,0.5,2.7c0,0.3,0,0.5-0.1,0.8
-			c0,0.3,0,0.5-0.1,0.7h-9.7c0.1,0.7,0.3,1.3,0.8,1.6c0.5,0.3,1,0.5,1.6,0.5c0.5,0,1.1-0.1,1.5-0.4c0.5-0.2,0.8-0.6,1-1l4.2,1.2
-			c-0.6,1.1-1.4,2-2.6,2.7C104.1,71.1,102.7,71.5,101,71.5L101,71.5z M103.2,62.8c-0.1-0.7-0.3-1.2-0.7-1.6
-			c-0.4-0.4-0.9-0.6-1.6-0.6c-0.6,0-1.2,0.2-1.6,0.6c-0.4,0.4-0.6,0.9-0.7,1.6H103.2L103.2,62.8z M110.1,52h5v13.4
-			c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2
-			c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3L110.1,52L110.1,52z M119.7,52h5v13.4c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1
-			c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3
-			L119.7,52L119.7,52z"/>
-	</g>
-	<path id="XMLID_23_" class="st1" d="M0,71.3l6.2-9.3L0,52.6h4.7l6.2,9.3l-6.2,9.3H0z"/>
-	<path id="XMLID_22_" class="st2" d="M6.2,71.3l6.2-9.3l-6.2-9.3h4.7l12.5,18.7h-4.7l-3.9-5.8l-3.9,5.8H6.2z"/>
-	<path id="XMLID_111_" class="st3" d="M21.3,65.8l-2.1-3.1h7.3v3.1L21.3,65.8L21.3,65.8z M18.2,61.1L16.1,58h10.4v3.1H18.2z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#333333;fill-opacity:0.937;}
+	.st1{fill:#463B63;}
+	.st2{fill:#5E5187;}
+	.st3{fill:#904F8C;}
+</style>
+<g id="Layer_1">
+</g>
+<g id="Layer_2">
+	<g id="XMLID_116_">
+		<path id="XMLID_129_" class="st0" d="M47.1,52.5v18.7h-5.1v-7.3h-6.3v7.3h-5.1V52.5h5.1v6.9h6.3v-6.9H47.1z M53.8,71.5
+			c-0.7,0-1.3-0.1-1.9-0.3c-0.6-0.2-1.1-0.5-1.6-0.9c-0.4-0.4-0.8-0.9-1-1.4C49.1,68.3,49,67.7,49,67c0-0.7,0.1-1.3,0.4-1.9
+			c0.3-0.6,0.7-1.1,1.2-1.5c0.5-0.4,1.2-0.7,1.9-1c0.7-0.2,1.5-0.3,2.4-0.3c1.1,0,2.1,0.2,2.8,0.5v-0.4c0-0.6-0.2-1.1-0.6-1.4
+			c-0.4-0.3-1-0.5-1.8-0.5c-0.8,0-1.5,0.1-2.2,0.4c-0.7,0.2-1.4,0.6-2.1,1.1l-1.4-3.1c1.8-1.2,3.9-1.8,6.2-1.8
+			c2.2,0,3.9,0.5,5.1,1.5c1.2,1,1.8,2.5,1.8,4.4v2.7c0,0.5,0.1,0.8,0.3,1c0.2,0.2,0.5,0.3,0.9,0.3v4.2c-0.5,0.1-0.9,0.1-1.3,0.2
+			c-0.4,0.1-0.8,0.1-1.1,0.1c-0.9,0-1.6-0.2-2.1-0.5c-0.5-0.3-0.8-0.8-0.9-1.4l-0.1-0.5c-0.6,0.8-1.3,1.4-2.1,1.8
+			C55.6,71.3,54.7,71.5,53.8,71.5L53.8,71.5z M55.3,67.9c0.3,0,0.6,0,0.9-0.1c0.3-0.1,0.6-0.2,0.8-0.4c0.2-0.1,0.4-0.3,0.5-0.4
+			c0.1-0.2,0.2-0.4,0.2-0.5v-1c-0.3-0.1-0.6-0.2-1-0.3c-0.4-0.1-0.7-0.1-0.9-0.1c-0.6,0-1.1,0.1-1.5,0.4c-0.4,0.3-0.6,0.7-0.6,1.1
+			c0,0.4,0.1,0.7,0.4,0.9C54.4,67.8,54.8,67.9,55.3,67.9L55.3,67.9z M71.8,71.5c-0.6,0-1.2,0-1.9-0.1c-0.7-0.1-1.3-0.2-2-0.3
+			c-0.6-0.1-1.2-0.3-1.8-0.5c-0.6-0.2-1.1-0.4-1.6-0.7l1.9-3.4c1,0.5,1.9,0.9,2.8,1.2c0.9,0.3,1.7,0.4,2.5,0.4
+			c0.9,0,1.3-0.2,1.3-0.7c0-0.2-0.2-0.4-0.5-0.6c-0.4-0.2-1-0.4-2-0.6c-1-0.3-1.8-0.5-2.5-0.8c-0.7-0.3-1.2-0.6-1.6-0.9
+			c-0.4-0.3-0.7-0.7-0.9-1.1c-0.2-0.4-0.3-0.9-0.3-1.4c0-0.7,0.1-1.4,0.4-1.9c0.3-0.6,0.7-1.1,1.2-1.6c0.5-0.4,1.1-0.8,1.9-1
+			c0.7-0.2,1.5-0.4,2.4-0.4c0.9,0,1.9,0.1,3,0.4c1.1,0.3,2.2,0.6,3.3,1.2l-1.9,3.2c-1-0.5-1.8-0.8-2.4-1c-0.6-0.2-1.3-0.3-1.9-0.3
+			c-0.4,0-0.7,0.1-0.9,0.2c-0.2,0.1-0.3,0.3-0.3,0.5c0,0.1,0,0.3,0.1,0.4c0.1,0.1,0.2,0.2,0.4,0.3c0.2,0.1,0.4,0.2,0.7,0.3
+			c0.3,0.1,0.7,0.2,1.2,0.3c1.1,0.3,1.9,0.5,2.7,0.8c0.7,0.3,1.3,0.6,1.7,0.9c0.4,0.3,0.7,0.7,0.9,1.2c0.2,0.4,0.3,0.9,0.3,1.5
+			c0,1.4-0.5,2.5-1.6,3.4C75.1,71.1,73.7,71.5,71.8,71.5L71.8,71.5z M88.7,71.2l-3.1-5.1l-1,1.1v3.9h-5V52h5v10.5l3.7-5.1h5.3
+			l-4.8,6.1l5.2,7.8H88.7L88.7,71.2z"/>
+		<path id="XMLID_117_" class="st0" d="M101,71.5c-1.2,0-2.3-0.2-3.2-0.6c-0.9-0.4-1.7-0.9-2.4-1.6c-0.6-0.6-1.1-1.4-1.4-2.2
+			c-0.3-0.8-0.5-1.7-0.5-2.7c0-1,0.2-1.9,0.5-2.8c0.3-0.9,0.8-1.7,1.4-2.3c0.6-0.7,1.4-1.2,2.4-1.6c0.9-0.4,2-0.6,3.3-0.6
+			c1.2,0,2.3,0.2,3.3,0.6c0.9,0.4,1.7,0.9,2.4,1.6c0.6,0.6,1.1,1.4,1.4,2.3c0.3,0.9,0.5,1.8,0.5,2.7c0,0.3,0,0.5-0.1,0.8
+			c0,0.3,0,0.5-0.1,0.7h-9.7c0.1,0.7,0.3,1.3,0.8,1.6c0.5,0.3,1,0.5,1.6,0.5c0.5,0,1.1-0.1,1.5-0.4c0.5-0.2,0.8-0.6,1-1l4.2,1.2
+			c-0.6,1.1-1.4,2-2.6,2.7C104.1,71.1,102.7,71.5,101,71.5L101,71.5z M103.2,62.8c-0.1-0.7-0.3-1.2-0.7-1.6
+			c-0.4-0.4-0.9-0.6-1.6-0.6c-0.6,0-1.2,0.2-1.6,0.6c-0.4,0.4-0.6,0.9-0.7,1.6H103.2L103.2,62.8z M110.1,52h5v13.4
+			c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2
+			c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3L110.1,52L110.1,52z M119.7,52h5v13.4c0,1.1,0.4,1.6,1.3,1.6c0.2,0,0.4,0,0.7-0.1
+			c0.2-0.1,0.5-0.2,0.7-0.3l0.6,4c-0.6,0.3-1.3,0.5-2,0.7c-0.7,0.2-1.4,0.2-2.1,0.2c-1.3,0-2.4-0.3-3.1-1c-0.7-0.7-1.1-1.7-1.1-3
+			L119.7,52L119.7,52z"/>
+	</g>
+	<path id="XMLID_23_" class="st1" d="M0,71.3l6.2-9.3L0,52.6h4.7l6.2,9.3l-6.2,9.3H0z"/>
+	<path id="XMLID_22_" class="st2" d="M6.2,71.3l6.2-9.3l-6.2-9.3h4.7l12.5,18.7h-4.7l-3.9-5.8l-3.9,5.8H6.2z"/>
+	<path id="XMLID_111_" class="st3" d="M21.3,65.8l-2.1-3.1h7.3v3.1L21.3,65.8L21.3,65.8z M18.2,61.1L16.1,58h10.4v3.1H18.2z"/>
+</g>
+</svg>
diff --git a/haskell/haskell-original.svg b/icons/haskell/haskell-original.svg
similarity index 97%
rename from haskell/haskell-original.svg
rename to icons/haskell/haskell-original.svg
index 999609f2..ea13aa20 100644
--- a/haskell/haskell-original.svg
+++ b/icons/haskell/haskell-original.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#463B63;}
-	.st1{fill:#5E5187;}
-	.st2{fill:#904F8C;}
-</style>
-<g id="Layer_1">
-	<path id="XMLID_9_" class="st0" d="M0,110.2L30.1,65L0,19.9h22.6L52.7,65l-30.1,45.1H0z"/>
-	<path id="XMLID_8_" class="st1" d="M30.1,110.2L60.2,65L30.1,19.9h22.6l60.2,90.3H90.4L71.5,81.9l-18.8,28.2H30.1z"/>
-	<path id="XMLID_1_" class="st2" d="M102.9,83.8l-10-15.1H128v15.1L102.9,83.8L102.9,83.8z M87.8,61.3l-10-15.1H128v15.1H87.8z"/>
-</g>
-<g id="Layer_2">
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 128 128" style="enable-background:new 0 0 128 128;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#463B63;}
+	.st1{fill:#5E5187;}
+	.st2{fill:#904F8C;}
+</style>
+<g id="Layer_1">
+	<path id="XMLID_9_" class="st0" d="M0,110.2L30.1,65L0,19.9h22.6L52.7,65l-30.1,45.1H0z"/>
+	<path id="XMLID_8_" class="st1" d="M30.1,110.2L60.2,65L30.1,19.9h22.6l60.2,90.3H90.4L71.5,81.9l-18.8,28.2H30.1z"/>
+	<path id="XMLID_1_" class="st2" d="M102.9,83.8l-10-15.1H128v15.1L102.9,83.8L102.9,83.8z M87.8,61.3l-10-15.1H128v15.1H87.8z"/>
+</g>
+<g id="Layer_2">
+</g>
+</svg>
diff --git a/icons/haskell/haskell-plain-workmark.svg b/icons/haskell/haskell-plain-workmark.svg
new file mode 100644
index 00000000..a41dd9cd
--- /dev/null
+++ b/icons/haskell/haskell-plain-workmark.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 128 128" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+	<path class="st0" d="m47.1 52.5v18.7h-5.1v-7.3h-6.3v7.3h-5.1v-18.7h5.1v6.9h6.3v-6.9h5.1zm6.7 19c-0.7 0-1.3-0.1-1.9-0.3s-1.1-0.5-1.6-0.9c-0.4-0.4-0.8-0.9-1-1.4-0.2-0.6-0.3-1.2-0.3-1.9s0.1-1.3 0.4-1.9 0.7-1.1 1.2-1.5 1.2-0.7 1.9-1c0.7-0.2 1.5-0.3 2.4-0.3 1.1 0 2.1 0.2 2.8 0.5v-0.4c0-0.6-0.2-1.1-0.6-1.4s-1-0.5-1.8-0.5-1.5 0.1-2.2 0.4c-0.7 0.2-1.4 0.6-2.1 1.1l-1.4-3.1c1.8-1.2 3.9-1.8 6.2-1.8 2.2 0 3.9 0.5 5.1 1.5s1.8 2.5 1.8 4.4v2.7c0 0.5 0.1 0.8 0.3 1s0.5 0.3 0.9 0.3v4.2c-0.5 0.1-0.9 0.1-1.3 0.2s-0.8 0.1-1.1 0.1c-0.9 0-1.6-0.2-2.1-0.5s-0.8-0.8-0.9-1.4l-0.1-0.5c-0.6 0.8-1.3 1.4-2.1 1.8-0.7 0.4-1.6 0.6-2.5 0.6zm1.5-3.6c0.3 0 0.6 0 0.9-0.1s0.6-0.2 0.8-0.4c0.2-0.1 0.4-0.3 0.5-0.4 0.1-0.2 0.2-0.4 0.2-0.5v-1c-0.3-0.1-0.6-0.2-1-0.3s-0.7-0.1-0.9-0.1c-0.6 0-1.1 0.1-1.5 0.4s-0.6 0.7-0.6 1.1 0.1 0.7 0.4 0.9c0.3 0.3 0.7 0.4 1.2 0.4zm16.5 3.6c-0.6 0-1.2 0-1.9-0.1s-1.3-0.2-2-0.3c-0.6-0.1-1.2-0.3-1.8-0.5s-1.1-0.4-1.6-0.7l1.9-3.4c1 0.5 1.9 0.9 2.8 1.2s1.7 0.4 2.5 0.4c0.9 0 1.3-0.2 1.3-0.7 0-0.2-0.2-0.4-0.5-0.6-0.4-0.2-1-0.4-2-0.6-1-0.3-1.8-0.5-2.5-0.8s-1.2-0.6-1.6-0.9-0.7-0.7-0.9-1.1-0.3-0.9-0.3-1.4c0-0.7 0.1-1.4 0.4-1.9 0.3-0.6 0.7-1.1 1.2-1.6 0.5-0.4 1.1-0.8 1.9-1 0.7-0.2 1.5-0.4 2.4-0.4s1.9 0.1 3 0.4 2.2 0.6 3.3 1.2l-1.9 3.2c-1-0.5-1.8-0.8-2.4-1s-1.3-0.3-1.9-0.3c-0.4 0-0.7 0.1-0.9 0.2s-0.3 0.3-0.3 0.5c0 0.1 0 0.3 0.1 0.4s0.2 0.2 0.4 0.3 0.4 0.2 0.7 0.3 0.7 0.2 1.2 0.3c1.1 0.3 1.9 0.5 2.7 0.8 0.7 0.3 1.3 0.6 1.7 0.9s0.7 0.7 0.9 1.2c0.2 0.4 0.3 0.9 0.3 1.5 0 1.4-0.5 2.5-1.6 3.4-1.3 0.7-2.7 1.1-4.6 1.1zm16.9-0.3-3.1-5.1-1 1.1v3.9h-5v-19.1h5v10.5l3.7-5.1h5.3l-4.8 6.1 5.2 7.8h-5.3v-0.1z"/>
+	<path class="st0" d="m101 71.5c-1.2 0-2.3-0.2-3.2-0.6s-1.7-0.9-2.4-1.6c-0.6-0.6-1.1-1.4-1.4-2.2s-0.5-1.7-0.5-2.7 0.2-1.9 0.5-2.8 0.8-1.7 1.4-2.3c0.6-0.7 1.4-1.2 2.4-1.6 0.9-0.4 2-0.6 3.3-0.6 1.2 0 2.3 0.2 3.3 0.6 0.9 0.4 1.7 0.9 2.4 1.6 0.6 0.6 1.1 1.4 1.4 2.3s0.5 1.8 0.5 2.7c0 0.3 0 0.5-0.1 0.8 0 0.3 0 0.5-0.1 0.7h-9.7c0.1 0.7 0.3 1.3 0.8 1.6s1 0.5 1.6 0.5c0.5 0 1.1-0.1 1.5-0.4 0.5-0.2 0.8-0.6 1-1l4.2 1.2c-0.6 1.1-1.4 2-2.6 2.7s-2.6 1.1-4.3 1.1zm2.2-8.7c-0.1-0.7-0.3-1.2-0.7-1.6s-0.9-0.6-1.6-0.6c-0.6 0-1.2 0.2-1.6 0.6s-0.6 0.9-0.7 1.6h4.6zm6.9-10.8h5v13.4c0 1.1 0.4 1.6 1.3 1.6 0.2 0 0.4 0 0.7-0.1 0.2-0.1 0.5-0.2 0.7-0.3l0.6 4c-0.6 0.3-1.3 0.5-2 0.7s-1.4 0.2-2.1 0.2c-1.3 0-2.4-0.3-3.1-1s-1.1-1.7-1.1-3v-15.5zm9.6 0h5v13.4c0 1.1 0.4 1.6 1.3 1.6 0.2 0 0.4 0 0.7-0.1 0.2-0.1 0.5-0.2 0.7-0.3l0.6 4c-0.6 0.3-1.3 0.5-2 0.7s-1.4 0.2-2.1 0.2c-1.3 0-2.4-0.3-3.1-1s-1.1-1.7-1.1-3v-15.5z"/>
+	<path d="M0,71.3l6.2-9.3L0,52.6h4.7l6.2,9.3l-6.2,9.3H0z"/>
+	<path d="m6.2 71.3 6.2-9.3-6.2-9.3h4.7l12.5 18.7h-4.7l-3.9-5.8-3.9 5.8h-4.7z"/>
+	<path d="m21.3 65.8-2.1-3.1h7.3v3.1h-5.2zm-3.1-4.7-2.1-3.1h10.4v3.1h-8.3z"/>
+</svg>
diff --git a/icons/haskell/haskell-plain.svg b/icons/haskell/haskell-plain.svg
new file mode 100644
index 00000000..06772ec6
--- /dev/null
+++ b/icons/haskell/haskell-plain.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 128 128" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+	<path d="M0,110.2L30.1,65L0,19.9h22.6L52.7,65l-30.1,45.1H0z"/>
+	<path d="M30.1,110.2L60.2,65L30.1,19.9h22.6l60.2,90.3H90.4L71.5,81.9l-18.8,28.2H30.1z"/>
+	<path d="m102.9 83.8-10-15.1h35.1v15.1h-25.1zm-15.1-22.5-10-15.1h50.2v15.1h-40.2z"/>
+</svg>
diff --git a/haskell/haskell.eps b/icons/haskell/haskell.eps
similarity index 100%
rename from haskell/haskell.eps
rename to icons/haskell/haskell.eps