diff --git a/gerane.Theme-Birds_of_Paradise/package.json b/gerane.Theme-Birds_of_Paradise/package.json
index e63c576f..9c0db597 100644
--- a/gerane.Theme-Birds_of_Paradise/package.json
+++ b/gerane.Theme-Birds_of_Paradise/package.json
@@ -2,7 +2,7 @@
     "name":  "Theme-BirdsofParadise",
     "displayName":  "Birds_of_Paradise Theme",
     "description":  "Birds_of_Paradise Theme ported from the BirdsofParadise TextMate Theme",
-    "version":  "0.0.5",
+    "version":  "0.0.6",
     "publisher":  "gerane",
     "engines":  {
                     "vscode":  "^0.10.1"
@@ -20,7 +20,7 @@
                         "themes":  [
                                        {
                                            "label":  "BirdsofParadise",
-                                           "path":  "./themes/Birds_of_Paradise.tmTheme",
+                                           "path":  "./themes/Birds_of_Paradise-color-theme.json",
                                            "uiTheme":  "vs-dark"
                                        }
                                    ]
diff --git a/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise-color-theme.json b/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise-color-theme.json
new file mode 100644
index 00000000..d4bcfcf9
--- /dev/null
+++ b/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise-color-theme.json
@@ -0,0 +1,378 @@
+{
+		"$schema": "vscode://schemas/color-theme",
+		"name": "Birds of Paradise",
+		"type": "dark",
+		"semanticHighlighting": true,
+		"colors": {
+			// Activity Bar
+			"activityBar.background": "#372725",
+			
+			// Button
+			"button.foreground": "#E6E1C4",
+			"button.background": "#5B413D",
+
+			// Editor
+			"editor.background": "#372725",
+			"editorCursor.foreground": "#DDDDDD",
+			"editor.foreground": "#E6E1C4",
+			"editorWhitespace.foreground": "#5B413D",
+			"editor.lineHighlightBackground": "#281C1C66",
+			"editor.selectionBackground": "#A40042",
+	
+			// Sidebar
+			"sideBar.background": "#372725",
+			"sideBar.foreground": "#E6E1C4",
+	
+			// Terminal
+			// Thanks to iterm colors https://raw.githubusercontent.com/mbadolato/iTerm2-Color-Schemes/master/schemes/BirdsOfParadise.itermcolors
+			// https://iterm2colorschemes.com
+			"terminal.ansiBlack": "#6a4d32",
+			"terminal.ansiBlue": "#6b98bb",
+			"terminal.ansiCyan": "#85b4bb",
+			"terminal.ansiGreen": "#85b4bb",
+			"terminal.ansiMagenta": "#bb94b4",
+			"terminal.ansiRed": "#cb4131",
+			"terminal.ansiWhite": "#e6e1c3",
+			"terminal.ansiYellow": "#eeac36",
+			
+			"terminal.ansiBrightBlack": "#ac7f5c",
+			"terminal.ansiBrightBlue": "#c4dbf0",
+			"terminal.ansiBrightCyan": "#a2d7de",
+			"terminal.ansiBrightGreen": "#a3ddc6",
+			"terminal.ansiBrightMagenta": "#dab0d4",
+			"terminal.ansiBrightRed": "#ee5d32",
+			"terminal.ansiBrightWhite": "#feffff",
+			"terminal.ansiBrightYellow": "#d8d762",
+			
+			// Titlebar
+			"titleBar.activeBackground": "#5B413D",
+	
+			// Window
+			"window.activeBorder": "#372725",
+
+			},
+	"tokenColors": [
+		{
+			"settings": {
+				"background": "#372725",
+				"foreground": "#E6E1C4"
+			}
+		},
+		{
+			"name": "Comment",
+			"scope": "comment",
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#6B4E32"
+			}
+		},
+		{
+			"name": "Python Docstring",
+			"scope": "string.quoted.double.block.python",
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#6B4E32"
+			}
+		},
+		{
+			"name": "Constant",
+			"scope": "constant",
+			"settings": {
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "[Meta] - The main color for Meta",
+			"scope": "meta",
+			"settings": {
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "Entity",
+			"scope": "entity",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#EFAC32"
+			}
+		},
+		{
+			"name": "Keyword",
+			"scope": "keyword",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#EF5D32"
+			}
+		},
+		{
+			"name": "Storage",
+			"scope": "storage",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#EF5D32"
+			}
+		},
+		{
+			"name": "String",
+			"scope": "string",
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#D9D762"
+			}
+		},
+		{
+			"name": "Support",
+			"scope": "support",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#E6E1C4"
+			}
+		},
+		{
+			"name": "Variable",
+			"scope": "variable",
+			"settings": {
+				"foreground": "#7DAF9C"
+			}
+		},
+		{
+			"name": "Invalid – Deprecated",
+			"scope": "invalid.deprecated",
+			"settings": {
+				"fontStyle": "italic underline",
+				"foreground": "#CC4232"
+			}
+		},
+		{
+			"name": "Invalid – Illegal",
+			"scope": "invalid.illegal",
+			"settings": {
+				"background": "#CC4232",
+				"foreground": "#E6E1C4"
+			}
+		},
+		{
+			"name": "-----------------------------------",
+			"settings": {}
+		},
+		{
+			"name": "♦ String constant",
+			"scope": "string constant",
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "♦ String.regexp",
+			"scope": "string.regexp",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#8856D2"
+			}
+		},
+		{
+			"name": "♦ String.regexp.«special»",
+			"scope": [
+				"string.regexp constant.character.escape",
+				"string.regexp source.ruby.embedded",
+				"string.regexp string.regexp.arbitrary-repitition"
+			],
+			"settings": {
+				"foreground": "#BE73FD"
+			}
+		},
+		{
+			"name": "♦ String variable",
+			"scope": "string variable",
+			"settings": {
+				"foreground": "#8A9A95"
+			}
+		},
+		{
+			"name": "♦ Support.function",
+			"scope": "support.function",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#EFAC32"
+			}
+		},
+		{
+			"name": "♦ Support.constant",
+			"scope": "support.constant",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "c C/C++ Preprocessor Line",
+			"scope": "meta.preprocessor.c",
+			"settings": {
+				"foreground": "#8996A8"
+			}
+		},
+		{
+			"name": "c C/C++ Preprocessor Directive",
+			"scope": "meta.preprocessor.c keyword",
+			"settings": {
+				"foreground": "#AFC4DB"
+			}
+		},
+		{
+			"name": "✘ Doctype/XML Processing",
+			"scope": [
+				"meta.tag.sgml.doctype",
+				"meta.tag.sgml.doctype entity",
+				"meta.tag.sgml.doctype string",
+				"meta.tag.preprocessor.xml",
+				"meta.tag.preprocessor.xml entity",
+				"meta.tag.preprocessor.xml string"
+			],
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#86B4BB"
+			}
+		},
+		{
+			"name": "✘ Meta.tag.«all»",
+			"scope": [
+				"declaration.tag",
+				"declaration.tag entity",
+				"meta.tag",
+				"meta.tag entity"
+			],
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#86B4BB"
+			}
+		},
+		{
+			"name": "⎇ diff.header",
+			"scope": [
+				"meta.diff",
+				"meta.diff.header",
+				"meta.separator"
+			],
+			"settings": {
+				"background": "#0E2231",
+				"fontStyle": "italic",
+				"foreground": "#F8F8F8"
+			}
+		},
+		{
+			"name": "⎇ diff.deleted",
+			"scope": "markup.deleted",
+			"settings": {
+				"background": "#420E09",
+				"foreground": "#F8F8F8"
+			}
+		},
+		{
+			"name": "⎇ diff.changed",
+			"scope": "markup.changed",
+			"settings": {
+				"background": "#4A410D",
+				"foreground": "#F8F8F8"
+			}
+		},
+		{
+			"name": "⎇ diff.inserted",
+			"scope": "markup.inserted",
+			"settings": {
+				"background": "#253B22",
+				"foreground": "#F8F8F8"
+			}
+		},
+		{
+			"name": "SASS @import",
+			"scope": "keyword.control.at-rule.sass",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#EF5D32"
+			}
+		},
+		{
+			"name": "SASS $variable",
+			"scope": "variable.parameter",
+			"settings": {
+				"foreground": "#7DAF9C"
+			}
+		},
+		{
+			"name": "SASS Attributes",
+			"scope": [
+				"keyword.control.untitled",
+				"entity.other.attribute-name.class.sass",
+				"entity.other.attribute-name.id.sass",
+				"entity.other.attribute-name.tag.pseudo-class"
+			],
+			"settings": {
+				"foreground": "#EFAC32"
+			}
+		},
+		{
+			"name": "SASS Properties",
+			"scope": "support.type.property-name.sass",
+			"settings": {
+				"foreground": "#E6E1C4"
+			}
+		},
+		{
+			"name": "SASS Values",
+			"scope": "support.constant.property-value.sass",
+			"settings": {
+				"foreground": "#C699BB"
+			}
+		},
+		{
+			"name": "CSS Attributes",
+			"scope": [
+				"meta.selector.css entity.name.tag",
+				"meta.selector.css entity.other.attribute-name.class",
+				"meta.selector.css entity.other.attribute-name.id"
+			],
+			"settings": {
+				"foreground": "#EFAC32"
+			}
+		},
+		{
+			"name": "CSS Values",
+			"scope": [
+				"meta.property-group support.constant.property-value.css",
+				"meta.property-value support.constant.property-value.css"
+			],
+			"settings": {
+				"foreground": "#C699BB"
+			}
+		},
+		{
+			"name": "CSS Constants",
+			"scope": [
+				"meta.property-value support.constant.named-color.css",
+				"meta.property-value constant"
+			],
+			"settings": {
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "[Python] - Color for Self Argument",
+			"scope": "variable.parameter.function.language.special.self.python",
+			"settings": {
+				"foreground": "#6C99BB"
+			}
+		},
+		{
+			"name": "[Python] - functions",
+			"scope": [
+				"meta.function-call.python",
+				"meta.function-call.generic.python",
+				"support.function.builtin.python"
+			],
+			"settings": {
+				"foreground": "#EFAC32"
+			}
+		}
+	],
+}
\ No newline at end of file
diff --git a/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise.tmTheme b/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise.tmTheme
deleted file mode 100644
index 8374b7da..00000000
--- a/gerane.Theme-Birds_of_Paradise/themes/Birds_of_Paradise.tmTheme
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>author</key>
-	<string>Michael Sheets</string>
-	<key>name</key>
-	<string>Birds of Paradise</string>
-	<key>settings</key>
-	<array>
-		<dict>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#372725</string>
-				<key>caret</key>
-				<string>#DDDDDD</string>
-				<key>foreground</key>
-				<string>#E6E1C4</string>
-				<key>invisibles</key>
-				<string>#5B413D</string>
-				<key>lineHighlight</key>
-				<string>#281C1C66</string>
-				<key>selection</key>
-				<string>#A40042</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Comment</string>
-			<key>scope</key>
-			<string>comment</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string>italic</string>
-				<key>foreground</key>
-				<string>#6B4E32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Python Docstring</string>
-			<key>scope</key>
-			<string>string.quoted.double.block.python</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string>italic</string>
-				<key>foreground</key>
-				<string>#6B4E32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Constant</string>
-			<key>scope</key>
-			<string>constant</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#6C99BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Entity</string>
-			<key>scope</key>
-			<string>entity</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#EFAC32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Keyword</string>
-			<key>scope</key>
-			<string>keyword</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#EF5D32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Storage</string>
-			<key>scope</key>
-			<string>storage</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#EF5D32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>String</string>
-			<key>scope</key>
-			<string>string</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string>italic</string>
-				<key>foreground</key>
-				<string>#D9D762</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Support</string>
-			<key>scope</key>
-			<string>support</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#E6E1C4</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Variable</string>
-			<key>scope</key>
-			<string>variable</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#7DAF9C</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Invalid – Deprecated</string>
-			<key>scope</key>
-			<string>invalid.deprecated</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string>italic underline</string>
-				<key>foreground</key>
-				<string>#CC4232</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Invalid – Illegal</string>
-			<key>scope</key>
-			<string>invalid.illegal</string>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#CC4232</string>
-				<key>foreground</key>
-				<string>#E6E1C4</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>-----------------------------------</string>
-			<key>settings</key>
-			<dict/>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ String constant</string>
-			<key>scope</key>
-			<string>string constant</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string>italic</string>
-				<key>foreground</key>
-				<string>#6C99BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ String.regexp</string>
-			<key>scope</key>
-			<string>string.regexp</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#8856D2</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ String.regexp.«special»</string>
-			<key>scope</key>
-			<string>string.regexp constant.character.escape, string.regexp source.ruby.embedded, string.regexp string.regexp.arbitrary-repitition</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#BE73FD</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ String variable</string>
-			<key>scope</key>
-			<string>string variable</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#8A9A95</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ Support.function</string>
-			<key>scope</key>
-			<string>support.function</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#EFAC32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>♦ Support.constant</string>
-			<key>scope</key>
-			<string>support.constant</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#6C99BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>c C/C++ Preprocessor Line</string>
-			<key>scope</key>
-			<string>meta.preprocessor.c</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#8996A8</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>c C/C++ Preprocessor Directive</string>
-			<key>scope</key>
-			<string>meta.preprocessor.c keyword</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#AFC4DB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>✘ Doctype/XML Processing</string>
-			<key>scope</key>
-			<string>meta.tag.sgml.doctype, meta.tag.sgml.doctype entity, meta.tag.sgml.doctype string, meta.tag.preprocessor.xml, meta.tag.preprocessor.xml entity, meta.tag.preprocessor.xml string</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#86B4BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>✘ Meta.tag.«all»</string>
-			<key>scope</key>
-			<string>declaration.tag, declaration.tag entity, meta.tag, meta.tag entity</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#86B4BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>⎇ diff.header</string>
-			<key>scope</key>
-			<string>meta.diff, meta.diff.header, meta.separator</string>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#0E2231</string>
-				<key>fontStyle</key>
-				<string>italic</string>
-				<key>foreground</key>
-				<string>#F8F8F8</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>⎇ diff.deleted</string>
-			<key>scope</key>
-			<string>markup.deleted</string>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#420E09</string>
-				<key>foreground</key>
-				<string>#F8F8F8</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>⎇ diff.changed</string>
-			<key>scope</key>
-			<string>markup.changed</string>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#4A410D</string>
-				<key>foreground</key>
-				<string>#F8F8F8</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>⎇ diff.inserted</string>
-			<key>scope</key>
-			<string>markup.inserted</string>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#253B22</string>
-				<key>foreground</key>
-				<string>#F8F8F8</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>SASS @import</string>
-			<key>scope</key>
-			<string>keyword.control.at-rule.sass</string>
-			<key>settings</key>
-			<dict>
-				<key>fontStyle</key>
-				<string></string>
-				<key>foreground</key>
-				<string>#EF5D32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>SASS $variable</string>
-			<key>scope</key>
-			<string>variable.parameter</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#7DAF9C</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>SASS Attributes</string>
-			<key>scope</key>
-			<string>keyword.control.untitled, entity.other.attribute-name.class.sass, entity.other.attribute-name.id.sass, entity.other.attribute-name.tag.pseudo-class</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#EFAC32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>SASS Properties</string>
-			<key>scope</key>
-			<string>support.type.property-name.sass</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#E6E1C4</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>SASS Values</string>
-			<key>scope</key>
-			<string>support.constant.property-value.sass</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#C699BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>CSS Attributes</string>
-			<key>scope</key>
-			<string>meta.selector.css entity.name.tag, meta.selector.css entity.other.attribute-name.class, meta.selector.css entity.other.attribute-name.id</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#EFAC32</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>CSS Values</string>
-			<key>scope</key>
-			<string>meta.property-group support.constant.property-value.css, meta.property-value support.constant.property-value.css</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#C699BB</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>CSS Constants</string>
-			<key>scope</key>
-			<string>meta.property-value support.constant.named-color.css, meta.property-value constant</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#6C99BB</string>
-			</dict>
-		</dict>
-	</array>
-	<key>uuid</key>
-	<string>CAB58494-D1A3-4BAD-BBC6-DAED679AD20B</string>
-</dict>
-</plist>