diff --git a/dracula.xml b/dracula.xml
index 2444210..7665b53 100644
--- a/dracula.xml
+++ b/dracula.xml
@@ -1,100 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<style-scheme id="dracula" name="Dracula" version="1.0">
 
-<style-scheme id="dracula" _name="Dracula" version="1.0">
   <author>Dracula Theme</author>
-  <_description>Dracula theme for Xed</_description>
-
-  <!-- Dracula -->
-  <color name="Background"   value="#282A36"/>
-  <color name="CurrentLine"  value="#44475A"/>
-  <color name="Selection"    value="#44475A"/>
-  <color name="Foreground"   value="#F8F8F2"/>
-  <color name="Comment"      value="#6272A4"/>
-  <color name="Red"          value="#FF5555"/>
-  <color name="Orange"       value="#FFB86C"/>
-  <color name="Yellow"       value="#F1FA8C"/>
-  <color name="Green"        value="#50FA7B"/>
-  <color name="Cyan"         value="#8BE9FD"/>
-  <color name="Purple"       value="#BD93F9"/>
-  <color name="Pink"         value="#FF79C6"/>
-
-  <!-- Global Settings -->
-  <style name="text"                        foreground="Foreground" background="Background"/>
-  <style name="selection"                   foreground="Foreground" background="Selection"/>
-  <style name="selection-unfocused"         foreground="Foreground" background="Selection"/>
-  <style name="cursor"                      foreground="Foreground"/>
-  <style name="secondary-cursor"            foreground="Foreground"/>
-  <style name="current-line"                background="CurrentLine"/>
-  <style name="line-numbers"                foreground="Comment" background="Background"/>
-  <style name="background-pattern"          background="Background"/>
-
-  <!-- Bracket Matching -->
-  <style name="bracket-match"               foreground="Pink"/>
-  <style name="bracket-mismatch"            foreground="Red" background="Background"/>
-
-  <!-- Right Margin -->
-  <style name="right-margin"                foreground="Comment" background="Background"/>
-
-  <!-- Search Matching -->
-  <style name="search-match"                foreground="Foreground" background="Cyan"/>
-
-  <!-- Comments -->
-  <style name="def:comment"                 foreground="Comment"/>
-  <style name="def:shebang"                 foreground="Comment" bold="true"/>
-  <style name="def:doc-comment-element"     italic="true"/>
-
-  <!-- Constants and variables -->
-  <style name="def:constant"                foreground="Orange"/>
-  <style name="def:string"                  foreground="Green"/>
-  <style name="def:special-char"            foreground="Pink"/>
-  <style name="def:special-constant"        foreground="Orange" bold="true"/>
-  <style name="def:number"                  foreground="Orange"/>
-  <style name="def:floating-point"          foreground="Orange"/>
-  <style name="def:boolean"                 foreground="Orange"/>
-  <style name="def:keyword"                 foreground="Pink" bold="true"/>
-  <style name="def:builtin"                 foreground="Cyan" bold="true"/>
-  <style name="def:variable"                foreground="Foreground"/>
-
-
-  <!-- Identifiers -->
-  <style name="def:identifier"              foreground="Foreground"/>
-
-  <!-- Statements -->
-  <style name="def:statement"               foreground="Pink"/>
-
-  <!-- Types -->
-  <style name="def:type"                    foreground="Purple"/>
-
-  <!-- Operators -->
-  <style name="def:operator"                foreground="Pink"/>
-
-  <!-- Markup -->
-  <style name="def:emphasis"                foreground="Yellow" italic="true"/>
-  <style name="def:strong-emphasis"         foreground="Yellow" bold="true"/>
-  <style name="def:inline-code"             foreground="Green"/>
-  <style name="def:insertion"               underline="single"/>
-  <style name="def:deletion"                strikethrough="true"/>
-  <style name="def:link-text"               foreground="Cyan"/>
-  <style name="def:link-symbol"             foreground="Cyan" bold="true"/>
-  <style name="def:link-destination"        foreground="Cyan" italic="true" underline="single"/>
-  <style name="def:heading"                 foreground="Purple" bold="true"/>
-  <style name="def:thematic-break"          foreground="Comment" bold="true"/>
-  <style name="def:preformatted-section"    foreground="Green"/>
-  <style name="def:list-marker"             foreground="Pink" bold="true"/>
-
-  <!-- Others -->
-  <style name="def:preprocessor"            foreground="Pink"/>
-  <style name="def:error"                   foreground="Red" bold="true"/>
-  <style name="def:warning"                 background="Yellow"/>
-  <style name="def:note"                    foreground="Cyan" bold="true"/>
-  <style name="def:net-address"             foreground="Cyan" italic="true" underline="single"/>
+  <description>UnOfficial Dracula color theme for Xed</description>
+
+  <!-- ============== Palette Dracula ============== -->
+  <color name="background"    value="#282A36"/>
+  <color name="current_line"  value="#44475A"/>
+  <color name="selection"     value="#44475A"/>
+  <color name="foreground"    value="#F8F8F2"/>
+  <color name="comment"       value="#6272A4"/>
+  <color name="cyan"          value="#8BE9FD"/>
+  <color name="green"         value="#50FA7B"/>
+  <color name="orange"        value="#FFB86C"/>
+  <color name="pink"          value="#FF79C6"/>
+  <color name="purple"        value="#BD93F9"/>
+  <color name="red"           value="#FF5555"/>
+  <color name="yellow"        value="#F1FA8C"/>
+
+  <!-- ============== General style for editor ============== -->
+  <style name="text"                        foreground="foreground" background="background"/>
+  <style name="selection"                   foreground="foreground" background="selection"/>
+  <style name="selection-unfocused"         foreground="foreground" background="current_line"/>
+  <style name="cursor"                      foreground="foreground"/>
+  <style name="secondary-cursor"            foreground="comment"/>
+  <style name="current-line"                background="current_line"/>
+  <style name="current-line-number"         foreground="foreground" background="current_line" bold="true"/>
+  <style name="line-numbers"                foreground="comment"    background="background"/>
+  <style name="draw-spaces"                 foreground="comment"/>
+  <style name="background-pattern"          background="current_line"/>
+  <style name="right-margin"                foreground="comment"    background="comment"/>
+  <style name="bracket-match"               foreground="pink"       bold="true"/>
+  <style name="bracket-mismatch"            foreground="red"        background="background" bold="true"/>
+  <style name="search-match"                foreground="background" background="yellow"/>
+  <style name="map-overlay"                 background="selection"/>
+
+  <!-- ============== Basic syntactic styles ============== -->
+  <style name="def:comment"                 foreground="comment"    italic="true"/>
+  <style name="def:shebang"                 foreground="comment"    bold="true"/>
+  <style name="def:doc-comment"             foreground="comment"    italic="true"/>
+  <style name="def:doc-comment-element"     foreground="comment"    italic="true"/>
+
+  <style name="def:constant"                foreground="purple"/>
+  <style name="def:string"                  foreground="yellow"/>
+  <style name="def:special-char"            foreground="pink"/>
+  <style name="def:special-constant"        foreground="purple"/>
+  <style name="def:floating-point"          foreground="purple"/>
+  <style name="def:decimal"                 foreground="purple"/>
+  <style name="def:base-n-integer"          foreground="purple"/>
+  <style name="def:complex"                 foreground="purple"/>
+  <style name="def:character"               foreground="yellow"/>
+  <style name="def:number"                  foreground="purple"/>
+  <style name="def:boolean"                 foreground="purple"/>
+
+  <style name="def:identifier"              foreground="green"/>
+  <style name="def:function"                foreground="green"/>
+  <style name="def:builtin"                 foreground="cyan"       italic="true"/>
+
+  <style name="def:statement"               foreground="pink"/>
+  <style name="def:keyword"                 foreground="pink"/>
+  <style name="def:operator"                foreground="pink"/>
+
+  <style name="def:type"                    foreground="cyan"       italic="true"/>
+
+  <style name="def:preprocessor"            foreground="pink"/>
+
+  <style name="def:error"                   foreground="red"        bold="true"/>
+  <style name="def:warning"                 foreground="orange"/>
+  <style name="def:note"                    foreground="yellow"     bold="true"/>
   <style name="def:underlined"              italic="true" underline="single"/>
-  <style name="def:function"                foreground="Yellow"/>
-
-  <!-- Diff -->
-  <style name="diff:location"               foreground="Orange"/>
-  <style name="diff:changed-line"           foreground="Purple"/>
-  <style name="diff:added-line"             foreground="Green"/>
-  <style name="diff:removed-line"           foreground="Red"/>
-  <style name="diff:special-case"           foreground="Orange"/>
+
+  <style name="def:net-address"             foreground="cyan"       underline="single"/>
+  <style name="def:net-address-in-comment"  foreground="cyan"       underline="single"/>
+
+  <!-- ============== Diff ============== -->
+  <style name="diff:added-line"             foreground="green"/>
+  <style name="diff:removed-line"           foreground="red"/>
+  <style name="diff:changed-line"           foreground="orange"/>
+  <style name="diff:diff-file"              foreground="cyan"       bold="true"/>
+  <style name="diff:location"               foreground="purple"/>
+  <style name="diff:special-case"           foreground="yellow"     bold="true"/>
+
+  <!-- ============== XML / HTML ============== -->
+  <style name="xml:attribute-name"          foreground="green"/>
+  <style name="xml:element-name"            foreground="pink"/>
+  <style name="xml:namespace"               foreground="pink"       bold="true"/>
+  <style name="xml:tag"                     foreground="pink"/>
+
+  <!-- ============== CSS ============== -->
+  <style name="css:selector"                foreground="green"/>
+  <style name="css:property-name"           foreground="cyan"/>
+  <style name="css:property-value"          foreground="orange"/>
+  <style name="css:color"                   foreground="purple"/>
+
+  <!-- ============== Markdown ============== -->
+  <style name="markdown:header"             foreground="purple"     bold="true"/>
+  <style name="markdown:list-marker"        foreground="pink"       bold="true"/>
+  <style name="markdown:link-text"          foreground="cyan"       underline="single"/>
+  <style name="markdown:url"                foreground="cyan"       underline="single"/>
+  <style name="markdown:code"               foreground="green"/>
+  <style name="markdown:emphasis"           italic="true"/>
+  <style name="markdown:strong-emphasis"    bold="true"/>
+  <style name="markdown:blockquote-marker"  foreground="comment"/>
+  <style name="markdown:horizontal-rule"    foreground="comment"/>
+
 </style-scheme>