diff --git a/package.json b/package.json
index d6aada2..f350b15 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,16 @@
                 "uiTheme": "vs-dark",
                 "path": "./themes/Andromeda-color-theme.json"
             },
+            {
+                "label": "Andromeda Bordered",
+                "uiTheme": "vs-dark",
+                "path": "./themes/Andromeda-color-theme-bordered.json"
+            },
+            {
+                "label": "Andromeda Italic Bordered",
+                "uiTheme": "vs-dark",
+                "path": "./themes/Andromeda-italic-color-theme-bordered.json"
+            },
             {
                 "label": "Andromeda Italic",
                 "uiTheme": "vs-dark",
diff --git a/themes/Andromeda-color-theme-bordered.json b/themes/Andromeda-color-theme-bordered.json
new file mode 100644
index 0000000..d585ffe
--- /dev/null
+++ b/themes/Andromeda-color-theme-bordered.json
@@ -0,0 +1,346 @@
+{
+    "name": "Andromeda Bordered",
+    "type": "dark",
+    "colors": {
+        "focusBorder": "#00e8c5b9",
+        "foreground": "#D5CED9",
+        "widget.shadow": "#14151A",
+        "selection.background": "#746f77",
+        "errorForeground": "#FC644D",
+
+        "button.background": "#00e8c5cc",
+        "button.hoverBackground": "#07d4b6cc",
+
+        "dropdown.background": "#2b303b",
+        "dropdown.border": "#363c49",
+
+        "input.background": "#2b303b",
+        "input.placeholderForeground": "#746f77",
+        "inputOption.activeBorder": "#C668BA",
+        "inputValidation.errorBackground": "#D65343",
+        "inputValidation.errorBorder": "#D65343",
+        "inputValidation.infoBackground": "#3A6395",
+        "inputValidation.infoBorder": "#3A6395",
+        "inputValidation.warningBackground": "#DE9237",
+        "inputValidation.warningBorder": "#DE9237",
+
+        "scrollbar.shadow": "#23262E",
+        "scrollbarSlider.activeBackground": "#3A3F4CCC",
+        "scrollbarSlider.background": "#3A3F4C77",
+        "scrollbarSlider.hoverBackground": "#3A3F4CAA",
+
+        "badge.background": "#00b0ff",
+
+        "progressBar.background": "#C668BA",
+
+        "list.activeSelectionBackground": "#23262E",
+        "list.activeSelectionForeground": "#00e8c6",
+        "list.dropBackground": "#3a404e",
+        "list.focusBackground": "#282b35",
+        "list.focusForeground": "#00e8c5b9",
+        "list.hoverBackground": "#3a404e",
+        "list.hoverForeground": "#eee",
+        "list.inactiveSelectionBackground": "#23262E",
+        "list.inactiveSelectionForeground": "#00e8c6",
+
+        "activityBar.background": "#20232B",
+        "activityBar.dropBackground": "#3a404e",
+        "activityBar.foreground": "#BAAFC0",
+        "activityBarBadge.background": "#00b0ff",
+        "activityBar.border": "#1B1D23",
+
+        "sideBar.background": "#23262E",
+        "sideBarSectionHeader.background": "#23262E",
+        "sideBarTitle.foreground": "#00e8c6",
+        "sideBar.foreground": "#746f77",
+        "sideBar.border": "#1B1D23",
+        
+
+        "editorGroup.background": "#23262E",
+        "editorGroup.dropBackground": "#495061d7",
+        "editorGroupHeader.tabsBackground": "#23262E",
+        "tab.activeBackground": "#23262e",
+        "tab.inactiveBackground": "#23262E",
+        "tab.activeForeground": "#00e8c6",
+        "tab.inactiveForeground": "#746f77",
+    
+        
+        
+
+        "editor.background": "#262A33",
+        "editor.foreground": "#D5CED9",
+        "editorLineNumber.foreground": "#746f77",
+        "editorCursor.foreground": "#FFF",
+        "editor.selectionBackground": "#303541",
+        "editor.selectionHighlightBackground": "#4F435580",
+        "editor.wordHighlightBackground": "#4F4355",
+        "editor.wordHighlightStrongBackground": "#db45a280",
+        "editor.findMatchBackground": "#f39d12d7",
+        "editor.findMatchHighlightBackground": "#59b8b377",
+        "editor.hoverHighlightBackground": "#373941",
+        "editor.lineHighlightBackground": "#2e323d",
+        "editor.lineHighlightBorder": "#2e323d",
+        "editorLink.activeForeground": "#3B79C7",
+        "editor.rangeHighlightBackground": "#372F3C",
+        "editorWhitespace.foreground": "#3F3544",
+        "editorIndentGuide.background": "#3F3544",
+        "editorRuler.foreground": "#4F4355",
+        "editorCodeLens.foreground": "#746f77",
+        "editorBracketMatch.background": "#746f77",
+        "editorBracketMatch.border": "#746f77",
+        "editorOverviewRuler.border": "#1B1D23",
+        "editorError.foreground": "#FC644D",
+        "editorWarning.foreground": "#FF9F2E",
+        "editorGutter.modifiedBackground": "#5BC0EBBB",
+        "editorGutter.addedBackground": "#9BC53DBB",
+        "editorGutter.deletedBackground": "#FC644DBB",
+
+        "diffEditor.insertedTextBackground": "#29BF1220",
+        "diffEditor.removedTextBackground": "#F21B3F20",
+
+        "editorWidget.background": "#20232A",
+        "editorSuggestWidget.background": "#20232A",
+        "editorSuggestWidget.border": "#372F3C",
+        "editorSuggestWidget.selectedBackground": "#373941",
+        "editorHoverWidget.background": "#373941",
+        "editorHoverWidget.border": "#00e8c5cc",
+        "debugExceptionWidget.background": "#FF9F2E60",
+        "debugExceptionWidget.border": "#FF9F2E60",
+
+        "peekView.border": "#23262E",
+        "peekViewEditor.background": "#1A1C22",
+        "peekViewEditor.matchHighlightBackground": "#FF9F2E60",
+        "peekViewResult.background": "#1A1C22",
+        "peekViewResult.matchHighlightBackground": "#FF9F2E60",
+        "peekViewResult.selectionBackground": "#23262E",
+        "peekViewTitle.background": "#1A1C22",
+        "peekViewTitleDescription.foreground": "#746f77",
+
+        "merge.currentHeaderBackground": "#F92672",
+        "merge.currentContentBackground": "#F9267240",
+        "merge.incomingHeaderBackground": "#3B79C7BB",
+        "merge.incomingContentBackground": "#3B79C740",
+
+        "panel.background": "#23262E",
+        "panel.border": "#1B1D23",
+        "panelTitle.activeBorder": "#23262E",
+        "panelTitle.inactiveForeground": "#746f77",
+
+        "statusBar.background": "#23262E",
+        "statusBar.debuggingBackground": "#FC644D",
+        "statusBar.noFolderBackground": "#23262E",
+        "statusBarItem.activeBackground": "#00e8c5cc",
+        "statusBarItem.hoverBackground": "#07d4b5b0",
+        "statusBarItem.prominentBackground": "#07d4b5b0",
+        "statusBarItem.prominentHoverBackground": "#00e8c5cc",
+
+        "titleBar.activeBackground": "#23262E",
+
+        "notification.background": "#2d313b",
+        "notification.buttonBackground": "#00e8c5cc",
+        "notification.buttonHoverBackground": "#07d4b5b0",
+        "notification.infoBackground": "#00b0ff",
+        "notification.warningBackground": "#FF9F2E",
+        "notification.errorBackground": "#FC644D",
+
+        "extensionButton.prominentBackground": "#07d4b6cc",
+        "extensionButton.prominentHoverBackground": "#07d4b5b0",
+
+        "pickerGroup.border": "#4F4355",
+        "pickerGroup.foreground": "#746f77",
+
+        "debugToolBar.background": "#20232A",
+
+        "walkThrough.embeddedEditorBackground": "#23262E"
+    },
+    "tokenColors": [
+        {
+            "settings": {
+                "foreground": "#D5CED9",
+                "background": "#23262E"
+            }
+        },
+        {
+            "name": "Comment color",
+            "scope": [
+                "comment",
+                "markup.quote.markdown",
+                "meta.diff",
+                "meta.diff.header"
+            ],
+            "settings": {
+                "foreground": "#5f6167"
+            }
+        },
+        {
+            "name": "Text Color",
+            "scope": [
+                "meta.template.expression.js",
+                "constant.name.attribute.tag.jade",
+                "punctuation.definition.metadata.markdown",
+                "punctuation.definition.string.end.markdown",
+                "punctuation.definition.string.begin.markdown"
+            ],
+            "settings": {
+                "foreground": "#D5CED9"
+            }
+        },
+        {
+            "name": "Cyan",
+            "scope": [
+                "variable",
+                "support.variable",
+                "entity.name.tag.yaml",
+                "constant.character.entity.html",
+                "source.css entity.name.tag.reference",
+                "beginning.punctuation.definition.list.markdown",
+                "source.css entity.other.attribute-name.parent-selector",
+                "meta.structure.dictionary.json support.type.property-name"
+            ],
+            "settings": {
+                "foreground": "#00e8c6"        
+            }
+        },
+        {
+            "name": "Orange",
+            "scope": [
+                "markup.bold",
+                "constant.numeric",
+                "meta.group.regexp",
+                "constant.other.php",
+                "support.constant.ext.php",
+                "constant.other.class.php",
+                "support.constant.core.php",
+                "fenced_code.block.language",
+                "constant.other.caps.python",
+                "entity.other.attribute-name",
+                "support.type.exception.python",
+                "source.css keyword.other.unit"
+            ],
+            "settings": {
+                "foreground": "#f39c12"
+            }
+        },
+        {
+            "name": "Yellow",
+            "scope": [
+                "markup.list",
+                "text.xml string",
+                "entity.name.type",
+                "support.function",
+                "entity.other.attribute-name",
+                "meta.at-rule.extend",
+                "entity.name.function",
+                "entity.other.inherited-class",
+                "entity.other.keyframe-offset.css",
+                "text.html.markdown string.quoted",
+                "meta.function-call.generic.python",
+                "meta.at-rule.extend support.constant",
+                "entity.other.attribute-name.class.jade",
+                "source.css entity.other.attribute-name",
+                "text.xml punctuation.definition.string"
+               
+            ],
+            "settings": {
+                "foreground": "#FFE66D"
+            }
+        },
+        {
+            "name": "Pink",
+            "scope": [
+                "markup.heading",
+                "variable.language.this.js",
+                "variable.language.special.self.python"
+            ],
+            "settings": {
+                "foreground": "#ff00aa"
+            }
+        },
+        {
+            "name": "Hot Pink",
+            "scope": [
+                "punctuation.definition.interpolation",
+                "punctuation.section.embedded.end.php",
+                "punctuation.section.embedded.end.ruby",
+                "punctuation.section.embedded.begin.php",
+                "punctuation.section.embedded.begin.ruby",
+                "punctuation.definition.template-expression",
+                "entity.name.tag"
+            ],
+            "settings": {
+                "foreground": "#f92672"
+            }
+        },
+        {
+            "name": "Purple",
+            "scope": [
+                "storage",
+                "keyword",
+                "meta.link",
+                "meta.image",
+                "markup.italic",
+                "source.js support.type"
+                
+            ],
+            "settings": {
+                "foreground": "#c74ded"
+            }
+        },
+        {
+            "name": "Blue",
+            "scope": [
+                "string.regexp",
+                "markup.changed"
+            ],
+            "settings": {
+                "foreground": "#7cb7ff"
+            }
+        },
+        {
+            "name": "Red",
+            "scope": [
+                "constant",
+                "support.class",
+                "keyword.operator",
+                "support.constant",
+                "text.html.markdown string",
+                "source.css support.function",
+                "source.php support.function",
+                "support.function.magic.python",
+                "entity.other.attribute-name.id",
+                "markup.deleted"
+            ],
+            "settings": {
+                "foreground": "#ee5d43"
+            }
+        },
+        {
+            "name": "Green",
+            "scope": [
+                "string",
+                "text.html.php string",
+                "markup.inline.raw",
+                "markup.inserted",
+                "punctuation.definition.string",
+                "punctuation.definition.markdown",
+                "text.html meta.embedded source.js string",
+                "text.html.php punctuation.definition.string",
+                "text.html meta.embedded source.js punctuation.definition.string",
+                "text.html punctuation.definition.string",
+                "text.html string"
+            ],
+            "settings": {
+                "foreground": "#96E072"
+            }
+        },
+        {
+            "name": "Font Underline",
+            "scope": [
+                "entity.other.inherited-class"
+            ],
+            "settings": {
+                "fontStyle": "underline"
+            }
+        }
+    ]
+}
diff --git a/themes/Andromeda-italic-color-theme-bordered.json b/themes/Andromeda-italic-color-theme-bordered.json
new file mode 100644
index 0000000..a009412
--- /dev/null
+++ b/themes/Andromeda-italic-color-theme-bordered.json
@@ -0,0 +1,360 @@
+{
+	"name": "Andromeda Italic Bordered",
+	"type": "dark",
+	"colors": {
+			"focusBorder": "#00e8c5b9",
+			"foreground": "#D5CED9",
+			"widget.shadow": "#14151A",
+			"selection.background": "#746f77",
+			"errorForeground": "#FC644D",
+
+			"button.background": "#00e8c5cc",
+			"button.hoverBackground": "#07d4b6cc",
+
+			"dropdown.background": "#2b303b",
+			"dropdown.border": "#363c49",
+
+			"input.background": "#2b303b",
+			"input.placeholderForeground": "#746f77",
+			"inputOption.activeBorder": "#C668BA",
+			"inputValidation.errorBackground": "#D65343",
+			"inputValidation.errorBorder": "#D65343",
+			"inputValidation.infoBackground": "#3A6395",
+			"inputValidation.infoBorder": "#3A6395",
+			"inputValidation.warningBackground": "#DE9237",
+			"inputValidation.warningBorder": "#DE9237",
+
+			"scrollbar.shadow": "#23262E",
+			"scrollbarSlider.activeBackground": "#3A3F4CCC",
+			"scrollbarSlider.background": "#3A3F4C77",
+			"scrollbarSlider.hoverBackground": "#3A3F4CAA",
+
+			"badge.background": "#00b0ff",
+
+			"progressBar.background": "#C668BA",
+
+			"list.activeSelectionBackground": "#23262E",
+			"list.activeSelectionForeground": "#00e8c6",
+			"list.dropBackground": "#3a404e",
+			"list.focusBackground": "#282b35",
+			"list.focusForeground": "#00e8c5b9",
+			"list.hoverBackground": "#3a404e",
+			"list.hoverForeground": "#eee",
+			"list.inactiveSelectionBackground": "#23262E",
+			"list.inactiveSelectionForeground": "#00e8c6",
+
+			"activityBar.background": "#20232B",
+			"activityBar.dropBackground": "#3a404e",
+			"activityBar.foreground": "#BAAFC0",
+			"activityBarBadge.background": "#00b0ff",
+			"activityBar.border": "#1B1D23",
+
+			"sideBar.background": "#23262E",
+			"sideBarSectionHeader.background": "#23262E",
+			"sideBarTitle.foreground": "#00e8c6",
+			"sideBar.foreground": "#746f77",
+			"sideBar.border": "#1B1D23",
+
+
+			"editorGroup.background": "#23262E",
+			"editorGroup.dropBackground": "#495061d7",
+			"editorGroupHeader.tabsBackground": "#23262E",
+			"tab.activeBackground": "#23262e",
+			"tab.inactiveBackground": "#23262E",
+			"tab.activeForeground": "#00e8c6",
+			"tab.inactiveForeground": "#746f77",
+
+
+
+
+			"editor.background": "#262A33",
+			"editor.foreground": "#D5CED9",
+			"editorLineNumber.foreground": "#746f77",
+			"editorCursor.foreground": "#FFF",
+			"editor.selectionBackground": "#303541",
+			"editor.selectionHighlightBackground": "#4F435580",
+			"editor.wordHighlightBackground": "#4F4355",
+			"editor.wordHighlightStrongBackground": "#db45a280",
+			"editor.findMatchBackground": "#f39d12d7",
+			"editor.findMatchHighlightBackground": "#59b8b377",
+			"editor.hoverHighlightBackground": "#373941",
+			"editor.lineHighlightBackground": "#2e323d",
+			"editor.lineHighlightBorder": "#2e323d",
+			"editorLink.activeForeground": "#3B79C7",
+			"editor.rangeHighlightBackground": "#372F3C",
+			"editorWhitespace.foreground": "#3F3544",
+			"editorIndentGuide.background": "#3F3544",
+			"editorRuler.foreground": "#4F4355",
+			"editorCodeLens.foreground": "#746f77",
+			"editorBracketMatch.background": "#746f77",
+			"editorBracketMatch.border": "#746f77",
+			"editorOverviewRuler.border": "#1B1D23",
+			"editorError.foreground": "#FC644D",
+			"editorWarning.foreground": "#FF9F2E",
+			"editorGutter.modifiedBackground": "#5BC0EBBB",
+			"editorGutter.addedBackground": "#9BC53DBB",
+			"editorGutter.deletedBackground": "#FC644DBB",
+	
+			"diffEditor.insertedTextBackground": "#29BF1220",
+			"diffEditor.removedTextBackground": "#F21B3F20",
+
+			"editorWidget.background": "#20232A",
+			"editorSuggestWidget.background": "#20232A",
+			"editorSuggestWidget.border": "#372F3C",
+			"editorSuggestWidget.selectedBackground": "#373941",
+			"editorHoverWidget.background": "#373941",
+			"editorHoverWidget.border": "#00e8c5cc",
+			"debugExceptionWidget.background": "#FF9F2E60",
+			"debugExceptionWidget.border": "#FF9F2E60",
+
+			"peekView.border": "#23262E",
+			"peekViewEditor.background": "#1A1C22",
+			"peekViewEditor.matchHighlightBackground": "#FF9F2E60",
+			"peekViewResult.background": "#1A1C22",
+			"peekViewResult.matchHighlightBackground": "#FF9F2E60",
+			"peekViewResult.selectionBackground": "#23262E",
+			"peekViewTitle.background": "#1A1C22",
+			"peekViewTitleDescription.foreground": "#746f77",
+
+			"merge.currentHeaderBackground": "#F92672",
+			"merge.currentContentBackground": "#F9267240",
+			"merge.incomingHeaderBackground": "#3B79C7BB",
+			"merge.incomingContentBackground": "#3B79C740",
+
+			"panel.background": "#23262E",
+			"panel.border": "#1B1D23",
+			"panelTitle.activeBorder": "#23262E",
+			"panelTitle.inactiveForeground": "#746f77",
+
+			"statusBar.background": "#23262E",
+			"statusBar.debuggingBackground": "#FC644D",
+			"statusBar.noFolderBackground": "#23262E",
+			"statusBarItem.activeBackground": "#00e8c5cc",
+			"statusBarItem.hoverBackground": "#07d4b5b0",
+			"statusBarItem.prominentBackground": "#07d4b5b0",
+			"statusBarItem.prominentHoverBackground": "#00e8c5cc",
+
+			"titleBar.activeBackground": "#23262E",
+
+			"notification.background": "#2d313b",
+			"notification.buttonBackground": "#00e8c5cc",
+			"notification.buttonHoverBackground": "#07d4b5b0",
+			"notification.infoBackground": "#00b0ff",
+			"notification.warningBackground": "#FF9F2E",
+			"notification.errorBackground": "#FC644D",
+
+			"extensionButton.prominentBackground": "#07d4b6cc",
+			"extensionButton.prominentHoverBackground": "#07d4b5b0",
+
+			"pickerGroup.border": "#4F4355",
+			"pickerGroup.foreground": "#746f77",
+
+			"debugToolBar.background": "#20232A",
+
+			"walkThrough.embeddedEditorBackground": "#23262E"
+	},
+	"tokenColors": [
+			{
+					"settings": {
+							"foreground": "#D5CED9",
+							"background": "#23262E"
+					}
+			},
+			{
+					"name": "Comment color",
+					"scope": [
+							"comment",
+							"markup.quote.markdown",
+							"meta.diff",
+                			"meta.diff.header"
+					],
+					"settings": {
+							"foreground": "#5f6167"
+					}
+			},
+			{
+					"name": "Text Color",
+					"scope": [
+							"meta.template.expression.js",
+							"constant.name.attribute.tag.jade",
+							"punctuation.definition.metadata.markdown",
+							"punctuation.definition.string.end.markdown",
+							"punctuation.definition.string.begin.markdown"
+					],
+					"settings": {
+							"foreground": "#D5CED9"
+					}
+			},
+			{
+					"name": "Cyan",
+					"scope": [
+							"variable",
+							"support.variable",
+							"entity.name.tag.yaml",
+							"constant.character.entity.html",
+							"source.css entity.name.tag.reference",
+							"beginning.punctuation.definition.list.markdown",
+							"source.css entity.other.attribute-name.parent-selector",
+							"meta.structure.dictionary.json support.type.property-name"
+
+					],
+					"settings": {
+							"foreground": "#00e8c6"
+					}
+			},
+			{
+					"name": "Orange",
+					"scope": [
+							"markup.bold",
+							"constant.numeric",
+							"meta.group.regexp",
+							"constant.other.php",
+							"support.constant.ext.php",
+							"constant.other.class.php",
+							"support.constant.core.php",
+							"fenced_code.block.language",
+							"constant.other.caps.python",
+							"entity.other.attribute-name",
+							"support.type.exception.python",
+							"source.css keyword.other.unit"
+					],
+					"settings": {
+							"foreground": "#f39c12"
+					}
+			},
+			{
+					"name": "Yellow",
+					"scope": [
+							"markup.list",
+							"text.xml string",
+							"entity.name.type",
+							"support.function",
+							"entity.other.attribute-name",
+							"meta.at-rule.extend",
+							"entity.name.function",
+							"entity.other.inherited-class",
+							"entity.other.keyframe-offset.css",
+							"text.html.markdown string.quoted",
+							"meta.function-call.generic.python",
+							"meta.at-rule.extend support.constant",
+							"entity.other.attribute-name.class.jade",
+							"source.css entity.other.attribute-name",
+							"text.xml punctuation.definition.string"
+
+					],
+					"settings": {
+							"foreground": "#FFE66D"
+					}
+			},
+			{
+					"name": "Pink",
+					"scope": [
+							"markup.heading",
+							"variable.language.this.js",
+							"variable.language.special.self.python"
+					],
+					"settings": {
+							"foreground": "#ff00aa"
+					}
+			},
+			{
+					"name": "Hot Pink",
+					"scope": [
+							"punctuation.definition.interpolation",
+							"punctuation.section.embedded.end.php",
+							"punctuation.section.embedded.end.ruby",
+							"punctuation.section.embedded.begin.php",
+							"punctuation.section.embedded.begin.ruby",
+							"punctuation.definition.template-expression",
+							"entity.name.tag"
+
+					],
+					"settings": {
+							"foreground": "#f92672"
+					}
+			},
+			{
+					"name": "Purple",
+					"scope": [
+							"storage",
+							"keyword",
+							"meta.link",
+							"meta.image",
+							"markup.italic",
+							"source.js support.type"
+
+					],
+					"settings": {
+							"foreground": "#c74ded"
+					}
+			},
+			{
+					"name": "Blue",
+					"scope": [
+							"string.regexp",
+							"markup.changed"
+					],
+					"settings": {
+							"foreground": "#7cb7ff"
+					}
+			},
+			{
+					"name": "Red",
+					"scope": [
+							"constant",
+							"support.class",
+							"keyword.operator",
+							"support.constant",
+							"text.html.markdown string",
+							"source.css support.function",
+							"source.php support.function",
+							"support.function.magic.python",
+							"entity.other.attribute-name.id",
+							"markup.deleted"
+					],
+					"settings": {
+							"foreground": "#ee5d43"
+					}
+			},
+			{
+					"name": "Green",
+					"scope": [
+							"string",
+							"text.html.php string",
+							"markup.inline.raw",
+							"markup.inserted",
+							"punctuation.definition.string",
+							"punctuation.definition.markdown",
+							"text.html meta.embedded source.js string",
+							"text.html.php punctuation.definition.string",
+							"text.html meta.embedded source.js punctuation.definition.string",
+							"text.html punctuation.definition.string",
+							"text.html string"
+					],
+					"settings": {
+							"foreground": "#96E072"
+					}
+			},
+			{
+					"name": "Font Underline",
+					"scope": [
+							"entity.other.inherited-class"
+					],
+					"settings": {
+							"fontStyle": "underline"
+					}
+			},
+			{
+					"name": "Font Italic",
+					"scope": [
+							"comment",
+							"invalid",
+							"keyword",
+							"entity.other.attribute-name"
+					],
+					"settings": {
+							"fontStyle": "italic"
+					}
+			}
+	]
+}