diff --git a/Project/Resources/SyntaxModes.xml b/Project/Resources/SyntaxModes.xml
index ab3a5d9..ca5eb29 100644
--- a/Project/Resources/SyntaxModes.xml
+++ b/Project/Resources/SyntaxModes.xml
@@ -361,5 +361,9 @@
   <Mode file="Xtend.xshd"
         name="Xtend"
         extensions=".xtend" />
+  
+  <Mode file="Yaml.xshd"
+        name="YAML"
+        extensions=".yaml;.yml" />
 
 </SyntaxModes>
\ No newline at end of file
diff --git a/Project/Resources/Yaml.xshd b/Project/Resources/Yaml.xshd
new file mode 100644
index 0000000..1cd9bec
--- /dev/null
+++ b/Project/Resources/Yaml.xshd
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<SyntaxDefinition xmlns="http://icsharpcode.net/sharpdevelop/syntaxdefinition/2008"
+                  name="YAML" extensions=".yaml,.yml">
+
+    <RuleSet ignorecase="true">
+        <Delimiters>&amp;|\/"',;=:- $()</Delimiters>
+
+        <KeyWords name="Keywords" color="Purple" bold="false" italic="false">
+            <Key word="true"/>
+            <Key word="false"/>
+            <Key word="null"/>
+        </KeyWords>
+
+        <Span name="Comments" color="Green" stopateol="true" >
+            <Begin>#</Begin>
+        </Span>
+
+        <Span name="DocumentStart" color="LightGreen" stopateol="true" >
+            <Begin>---</Begin>
+        </Span>
+
+        <Span name="Tag" color="Red" stopateol="true" >
+            <Begin startofline="true">%</Begin>
+        </Span>
+        
+        <Span name="String" stopateol="true" color="Maroon" bold="false" italic="false" escapecharacter="\">
+            <Begin>"</Begin>
+            <End>"</End>
+        </Span>
+
+        <Span name="Char" stopateol="true" color="Maroon" bold="false" italic="false" escapecharacter="\">
+            <Begin>'</Begin>
+            <End>'</End>
+        </Span>
+
+        <MarkPrevious name="key" color="Blue" bold="false" italic="false">:</MarkPrevious>
+    </RuleSet>
+</SyntaxDefinition>
\ No newline at end of file