diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
index f73d612..c3687f0 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.datatools.sqltools.sqleditor; singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.201.qualifier
 Bundle-Activator: org.eclipse.datatools.sqltools.sqleditor.internal.SQLEditorPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/build.properties b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/build.properties
index 48d7184..f543f9a 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/build.properties
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/build.properties
@@ -10,7 +10,8 @@
                default.properties,\
                about.html,\
                META-INF/,\
+               css/,\
                templates/
-               
+
 javadoc.dir =		doc/api/
 download.dir =		./download/
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/css/e4-dark_sql_editor.css b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/css/e4-dark_sql_editor.css
new file mode 100644
index 0000000..dbd0afe
--- /dev/null
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/css/e4-dark_sql_editor.css
@@ -0,0 +1,25 @@
+/*******************************************************************************
+* Copyright (c) 2015, 2016 Luis Fernando Cortes and others.
+*
+* This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License 2.0
+* which accompanies this distribution, and is available at
+* https://www.eclipse.org/legal/epl-2.0/
+*
+* SPDX-License-Identifier: EPL-2.0
+*
+* Contributors:
+*     Luis Fernando Cortes <lfcortes12@gmail.com> - Bug 559315 initial support for dark Eclipse theme
+*******************************************************************************/
+
+IEclipsePreferences#org.eclipse.datatools.sqltools.sqleditor {
+	preferences:
+		'Identifier=0,0,0,0,0,103,140,177'
+		'Type=1,0,0,0,0,204,108,29'
+		'Keyword=1,0,0,0,0,204,108,29'
+		'Double\ quoted\ string=0,0,0,0,0,42,161,152'
+		'Single\ quoted\ string=0,0,0,0,0,42,161,152'
+		'Single-line\ comment=0,0,0,0,0,88,110,117'
+		'Multi-line\ comment=0,0,0,0,0,88,110,117'
+		'Others=0,0,0,0,1,204,204,204'
+}
\ No newline at end of file
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/plugin.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/plugin.xml
index b2dbb9c..b6db014 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/plugin.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/plugin.xml
@@ -278,6 +278,14 @@
             id="org.eclipse.datatools.sqltools.sqleditor.preferences.syntaxcoloring"/>
    </extension>
 
-  
-    
+  <extension
+         point="org.eclipse.e4.ui.css.swt.theme">
+      <stylesheet
+            uri="css/e4-dark_sql_editor.css">
+         <themeid
+               refid="org.eclipse.e4.ui.css.theme.e4_dark">
+         </themeid>
+      </stylesheet>
+   </extension>
+
 </plugin>
diff --git a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
index 864b0b9..0acb6bb 100644
--- a/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
+++ b/plugins/sqltools/org.eclipse.datatools.sqltools.sqleditor/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>org.eclipse.datatools.plugins</groupId>
   <artifactId>org.eclipse.datatools.sqltools.sqleditor</artifactId>
-  <version>1.2.200-SNAPSHOT</version>
+  <version>1.2.201-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>