diff --git a/.gitignore b/.gitignore
index adc7e6a..8a959f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /lib/
 *.vsix
 yarn.lock
+*.dict
+.vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 63395e3..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "files.exclude": {
-    "lib": true
-  },
-  "search.exclude": {
-    "**/lib/**": true
-  },
-  "files.watcherExclude": {
-    "**/.git/objects/**": true,
-    "**/lib/*": true,
-    "**/node_modules/**": true
-  }
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dc39e8..14ec93d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Release Notes
 
+## 0.15.0 (2018-05-08)
+
+**Requires VSCode 1.23.0 or above**
+
+* New UI for [PIO Unified Debugger](http://docs.platformio.org/page/plus/debugging.html):
+  - Conditional Breakpoints
+  - Expressions and Watchpoints
+  - Generic Registers
+  - Peripheral Registers
+  - Memory Viewer
+  - Disassembly
+  - Multi-thread support
+  - A hot restart of an active debugging session
+* Retain PIO Home state when switching between tabs (issue [#32](https://github.com/platformio/platformio-vscode-ide/issues/32))
+
 ## 0.14.2 (2018-04-28)
 
 * Fixed "PIP: Could not find a version that satisfies the requirement" (issue [#102](https://github.com/platformio/platformio-vscode-ide/issues/102))
@@ -10,7 +25,7 @@
 
 ## 0.14.0 (2018-03-14)
 
-* Intial support for PIO Enterprise
+* Initial support for PIO Enterprise
 * Speed up the loading of PIO Home [PIO Home](http://docs.platformio.org/page/home/index.html)
 
 ## 0.13.2 (2018-03-08)
diff --git a/package.json b/package.json
index 4c753db..a4ec6ef 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "platformio-ide",
-  "version": "0.14.2",
+  "version": "0.15.0",
   "publisher": "platformio",
   "engines": {
-    "vscode": "^1.18.0"
+    "vscode": "^1.23.0"
   },
   "license": "Apache-2.0",
   "displayName": "PlatformIO IDE",
   "description": "Development environment for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), STM32, PIC32, nRF51/nRF52, FPGA, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
   "categories": [
+    "Programming Languages",
     "Debuggers",
-    "Languages",
     "Other"
   ],
   "keywords": [
@@ -18,7 +18,7 @@
     "embedded",
     "firmware",
     "debug",
-    "arduino"
+    "microcontroller"
   ],
   "preview": true,
   "main": "./lib/main",
@@ -38,6 +38,58 @@
     "*"
   ],
   "contributes": {
+    "languages": [
+      {
+        "id": "platformio-debug.disassembly",
+        "aliases": [
+          "Disassembly"
+        ],
+        "extensions": [
+          ".dbgasm"
+        ]
+      },
+      {
+        "id": "platformio-debug.memoryview",
+        "aliases": [
+          "Memory"
+        ],
+        "extensions": [
+          ".dbgmem"
+        ]
+      },
+      {
+        "id": "platformio-debug.asm",
+        "aliases": [
+          "Assembly",
+          "asm"
+        ],
+        "extensions": [
+          ".asm",
+          ".nasm",
+          ".yasm",
+          ".inc",
+          ".s"
+        ],
+        "configuration": "./syntaxes/assembly-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "platformio-debug.disassembly",
+        "scopeName": "source.platformio-debug-disassembly",
+        "path": "./syntaxes/platformio-debug-disassembly.json"
+      },
+      {
+        "language": "platformio-debug.memoryview",
+        "scopeName": "source.platformio-debug-memoryview",
+        "path": "./syntaxes/platformio-debug-memoryview.json"
+      },
+      {
+        "language": "platformio-debug.asm",
+        "scopeName": "source.platformio-debug-asm",
+        "path": "./syntaxes/assembly.tmLanguage"
+      }
+    ],
     "commands": [
       {
         "command": "platformio-ide.showHome",
@@ -93,8 +145,277 @@
         "command": "platformio-ide.upgradeCore",
         "title": "Upgrade PlatformIO Core to the latest version",
         "category": "PlatformIO"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.peripherals.updateNode",
+        "title": "Update Value"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.peripherals.selectedNode",
+        "title": "Selected"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.registers.selectedNode",
+        "title": "Selected"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.peripherals.copyValue",
+        "title": "Copy Value"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.registers.copyValue",
+        "title": "Copy Value"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.peripherals.setFormat",
+        "title": "Set Value Format"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.registers.setFormat",
+        "title": "Set Value Format"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.examineMemory",
+        "title": " View Memory",
+        "icon": {
+          "light": "resources/icons/add.svg",
+          "dark": "resources/icons/add-inverse.svg"
+        }
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.memory.clearHistory",
+        "title": "Clear Memory View History",
+        "icon": {
+          "light": "resources/icons/closeall.svg",
+          "dark": "resources/icons/closeall-inverse.svg"
+        }
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.memory.deleteHistoryItem",
+        "title": "Delete"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.viewDisassembly",
+        "title": "View Disassembly (Function)"
+      },
+      {
+        "category": "PlatformIO Debug",
+        "command": "platformio-debug.setForceDisassembly",
+        "title": "Set Force Disassembly"
       }
     ],
+    "debuggers": [
+      {
+        "enableBreakpointsFor": {
+          "languageIds": [
+            "c",
+            "cpp",
+            "asm",
+            "arm",
+            "platformio-debug.disassembly"
+          ]
+        },
+        "configurationAttributes": {
+          "launch": {
+            "properties": {
+              "executable": {
+                "description": "Path of firmware or program",
+                "type": "string"
+              },
+              "toolchainBinDir": {
+                "description": "Path of toolchain binary directory",
+                "type": "string"
+              },
+              "svdPath": {
+                "default": null,
+                "description": "Path to an SVD file describing the peripherals of the microcontroller",
+                "type": "string"
+              },
+              "showDevDebugOutput": {
+                "default": false,
+                "description": "Prints all GDB responses to the console",
+                "type": "boolean"
+              }
+            },
+            "required": [
+              "executable",
+              "toolchainBinDir"
+            ]
+          }
+        },
+        "initialConfigurations": [
+          {
+            "name": "PlatformIO Debugger",
+            "request": "launch",
+            "type": "platformio-debug",
+            "toolchainBinDir": "/usr/local/bin"
+          }
+        ],
+        "configurationSnippets": [
+          {
+            "body": {
+              "name": "${6:PlatformIO Debugger}",
+              "request": "launch",
+              "type": "platformio-debug",
+              "executable": ".pioenvs/myenv/firmware.elf",
+              "toolchainBinDir": "/usr/local/bin"
+            },
+            "description": "PlatformIO Debugger",
+            "label": "PlatformIO Debugger"
+          }
+        ],
+        "label": "PlatformIO Debugger",
+        "program": "./node_modules/platformio-vscode-debug/lib/adapter.js",
+        "runtime": "node",
+        "type": "platformio-debug"
+      }
+    ],
+    "menus": {
+      "commandPalette": [
+        {
+          "command": "platformio-debug.peripherals.updateNode",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.peripherals.selectedNode",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.peripherals.copyValue",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.peripherals.setFormat",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.registers.copyValue",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.registers.selectedNode",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.registers.setFormat",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.memory.deleteHistoryItem",
+          "when": "false"
+        },
+        {
+          "command": "platformio-debug.examineMemory",
+          "when": "debugType == platformio-debug"
+        },
+        {
+          "command": "platformio-debug.memory.clearHistory",
+          "when": "debugType == platformio-debug"
+        },
+        {
+          "command": "platformio-debug.viewDisassembly",
+          "when": "debugType == platformio-debug"
+        },
+        {
+          "command": "platformio-debug.setForceDisassembly",
+          "when": "debugType == platformio-debug"
+        }
+      ],
+      "view/item/context": [
+        {
+          "command": "platformio-debug.peripherals.updateNode",
+          "when": "view == platformio-debug.peripherals && viewItem == field"
+        },
+        {
+          "command": "platformio-debug.peripherals.updateNode",
+          "when": "view == platformio-debug.peripherals && viewItem == registerRW"
+        },
+        {
+          "command": "platformio-debug.peripherals.updateNode",
+          "when": "view == platformio-debug.peripherals && viewItem == registerWO"
+        },
+        {
+          "command": "platformio-debug.peripherals.copyValue",
+          "when": "view == platformio-debug.peripherals && viewItem == field"
+        },
+        {
+          "command": "platformio-debug.peripherals.copyValue",
+          "when": "view == platformio-debug.peripherals && viewItem == registerRW"
+        },
+        {
+          "command": "platformio-debug.peripherals.copyValue",
+          "when": "view == platformio-debug.peripherals && viewItem == registerRO"
+        },
+        {
+          "command": "platformio-debug.registers.copyValue",
+          "when": "view == platformio-debug.registers && viewItem == register"
+        },
+        {
+          "command": "platformio-debug.registers.copyValue",
+          "when": "view == platformio-debug.registers && viewItem == field"
+        },
+        {
+          "command": "platformio-debug.peripherals.setFormat",
+          "when": "view == platformio-debug.peripherals"
+        },
+        {
+          "command": "platformio-debug.registers.setFormat",
+          "when": "view == platformio-debug.registers"
+        },
+        {
+          "command": "platformio-debug.memory.deleteHistoryItem",
+          "when": "view == platformio-debug.memory",
+          "group": "inline"
+        }
+      ],
+      "view/title": [
+        {
+          "command": "platformio-debug.examineMemory",
+          "when": "view == platformio-debug.memory",
+          "group": "navigation"
+        },
+        {
+          "command": "platformio-debug.memory.clearHistory",
+          "when": "view == platformio-debug.memory",
+          "group": "navigation"
+        }
+      ]
+    },
+    "views": {
+      "debug": [
+        {
+          "id": "platformio-debug.peripherals",
+          "name": "Peripherals",
+          "when": "debugType == platformio-debug && peripheralsEnabled"
+        },
+        {
+          "id": "platformio-debug.registers",
+          "name": "Registers",
+          "when": "debugType == platformio-debug"
+        },
+        {
+          "id": "platformio-debug.memory",
+          "name": "Memory",
+          "when": "debugType == platformio-debug"
+        },
+        {
+          "id": "platformio-debug.disassembly",
+          "name": "Disassembly",
+          "when": "debugType == platformio-debug"
+        }
+      ]
+    },
     "keybindings": [
       {
         "command": "platformio-ide.build",
@@ -222,10 +543,10 @@
   "dependencies": {
     "fs-plus": "^3.0.0",
     "ini": "^1.3.4",
-    "platformio-node-helpers": "^0.5.2"
+    "platformio-node-helpers": "^0.5.2",
+    "platformio-vscode-debug": "^1.0.0"
   },
   "extensionDependencies": [
-    "ms-vscode.cpptools",
-    "webfreak.debug"
+    "ms-vscode.cpptools"
   ]
 }
diff --git a/resources/icons/add-inverse.svg b/resources/icons/add-inverse.svg
new file mode 100644
index 0000000..3475c1e
--- /dev/null
+++ b/resources/icons/add-inverse.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#C5C5C5"/><rect height="3" width="11" y="7" x="3" fill="#C5C5C5"/></svg>
\ No newline at end of file
diff --git a/resources/icons/add.svg b/resources/icons/add.svg
new file mode 100644
index 0000000..bdecdb0
--- /dev/null
+++ b/resources/icons/add.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><title>Layer 1</title><rect height="11" width="3" y="3" x="7" fill="#424242"/><rect height="3" width="11" y="7" x="3" fill="#424242"/></svg>
\ No newline at end of file
diff --git a/resources/icons/closeall-inverse.svg b/resources/icons/closeall-inverse.svg
new file mode 100644
index 0000000..74e8dd8
--- /dev/null
+++ b/resources/icons/closeall-inverse.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#1E1E1E" d="M16 12h-2v2h-2v2H0V5h2V3h2V1h12v11z"/><g fill="#C5C5C5"><path d="M3 5h9v8h1V4H3zM5 2v1h9v8h1V2zM1 6v9h10V6H1zm8 7H7.5L6 11.5 4.5 13H3l2.3-2.3L3 8.5h1.5L6 10l1.5-1.5H9l-2.3 2.3L9 13z"/></g></svg>
\ No newline at end of file
diff --git a/resources/icons/closeall.svg b/resources/icons/closeall.svg
new file mode 100644
index 0000000..7250ff6
--- /dev/null
+++ b/resources/icons/closeall.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><path fill="#F6F6F6" d="M16 12h-2v2h-2v2H0V5h2V3h2V1h12v11z"/><g fill="#424242"><path d="M3 5h9v8h1V4H3zM5 2v1h9v8h1V2zM1 6v9h10V6H1zm8 7H7.5L6 11.5 4.5 13H3l2.3-2.3L3 8.5h1.5L6 10l1.5-1.5H9l-2.3 2.3L9 13z"/></g></svg>
\ No newline at end of file
diff --git a/src/constants.js b/src/constants.js
index 72582fe..7e96b80 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -11,4 +11,4 @@ export const IS_OSX = process.platform == 'darwin';
 export const IS_LINUX = !IS_WINDOWS && !IS_OSX;
 
 export const AUTO_REBUILD_DELAY = 3000;
-export const PIO_CORE_MIN_VERSION = '3.5.2-rc.3';
+export const PIO_CORE_MIN_VERSION = '3.5.2';
diff --git a/src/home.js b/src/home.js
index 0366bcb..53ef49f 100644
--- a/src/home.js
+++ b/src/home.js
@@ -12,13 +12,52 @@ import { extension } from './main';
 import vscode from 'vscode';
 
 
-export class HomeContentProvider {
+export default class PIOHome {
 
-  static shutdownServer() {
-    pioNodeHelpers.home.shutdownServer();
+  constructor() {
+    this._currentPanel = null;
+  }
+
+  toggle() {
+    if (this._currentPanel) {
+      this._currentPanel.reveal(vscode.ViewColumn.One);
+    } else {
+      this._currentPanel = this.newPanel();
+    }
+  }
+
+  async newPanel() {
+    const panel = vscode.window.createWebviewPanel(
+      'pioHome',
+      extension.getEnterpriseSetting('pioHomeTitle', 'PIO Home'),
+      vscode.ViewColumn.One,
+      {
+        enableScripts: true,
+        retainContextWhenHidden: true
+      }
+    );
+    panel.onDidDispose(this.onPanelDisposed.bind(this));
+    panel.webview.html = this.getLoadingContent();
+    this.getWebviewContent().then(html => panel.webview.html = html );
+    return panel;
   }
 
-  async provideTextDocumentContent(uri) {
+  getTheme() {
+    const workbench = vscode.workspace.getConfiguration('workbench') || {};
+    return (workbench.colorTheme || '').toLowerCase().includes('light') ? 'light' : 'dark';
+  }
+
+  getLoadingContent() {
+    const theme = this.getTheme();
+    return `<!DOCTYPE html>
+    <html lang="en">
+    <body style="background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E' }">
+      Loading...
+    </body>
+    </html>`;
+  }
+
+  async getWebviewContent() {
     const params = await pioNodeHelpers.home.ensureServerStarted({
       onIDECommand: (command, params) => {
         if (command === 'open_project') {
@@ -26,11 +65,10 @@ export class HomeContentProvider {
         }
       }
     });
-    const start = `/${ uri.authority }`;
-    const workbench = vscode.workspace.getConfiguration('workbench') || {};
-    const theme = (workbench.colorTheme || '').toLowerCase().includes('light') ? 'light' : 'dark';
-    return `
-      <html>
+    const start = '/';
+    const theme = this.getTheme();
+    return `<!DOCTYPE html>
+      <html lang="en">
       <body style="margin: 0; padding: 0; height: 100%; overflow: hidden; background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E' }">
         <iframe src="${ pioNodeHelpers.home.getFrontendUri(params.host, params.port, {
         start,
@@ -46,4 +84,16 @@ export class HomeContentProvider {
     `;
   }
 
+  onPanelDisposed() {
+    this._currentPanel = null;
+  }
+
+  shutdownServer() {
+    pioNodeHelpers.home.shutdownServer();
+  }
+
+  dispose() {
+    this.shutdownServer();
+  }
+
 }
diff --git a/src/main.js b/src/main.js
index fbef911..bec9ace 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,11 +7,12 @@
  */
 
 import * as pioNodeHelpers from 'platformio-node-helpers';
+import * as piodebug from 'platformio-vscode-debug';
 
 import { getIDEVersion, isPIOProject } from './utils';
 
-import { HomeContentProvider } from './home';
 import InstallationManager from './installer/manager';
+import PIOHome from './home';
 import PIOTasksProvider from './tasks';
 import PIOTerminal from './terminal';
 import ProjectIndexer from './project/indexer';
@@ -21,21 +22,28 @@ import vscode from 'vscode';
 class PlatformIOVSCodeExtension {
 
   constructor() {
-    this.pioTerm = new PIOTerminal();
+    this.context = null;
+    this.pioTerm = null;
+    this.pioHome = null;
 
-    this._context = null;
     this._isMonitorRun = false;
     this._enterpriseSettings = undefined;
   }
 
   async activate(context) {
-    this._context = context;
+    this.context = context;
     const hasPIOProject = this.workspaceHasPIOProject();
 
     if (this.getConfig().get('activateOnlyOnPlatformIOProject') && !hasPIOProject) {
       return;
     }
 
+    this.pioTerm = new PIOTerminal();
+    this.pioHome = new PIOHome();
+
+    this.context.subscriptions.push(this.pioTerm);
+    this.context.subscriptions.push(this.pioHome);
+
     pioNodeHelpers.misc.patchOSEnviron({
       caller: 'vscode',
       useBuiltinPIOCore: this.getConfig().get('useBuiltinPIOCore'),
@@ -58,6 +66,7 @@ class PlatformIOVSCodeExtension {
       this.pioTerm.updateEnvConfiguration();
     }
 
+    this.initDebug();
     this.initTasksProvider();
     this.initStatusBar({ ignoreCommands: this.getEnterpriseSetting('ignoreToolbarCommands') });
     this.initProjectIndexer();
@@ -80,7 +89,7 @@ class PlatformIOVSCodeExtension {
     return ext.exports.settings;
   }
 
-  getEnterpriseSetting(id, defaultValue=undefined) {
+  getEnterpriseSetting(id, defaultValue = undefined) {
     if (!this._enterpriseSettings) {
       this._enterpriseSettings = this.loadEnterpriseSettings();
     }
@@ -103,7 +112,7 @@ class PlatformIOVSCodeExtension {
         message: 'Checking PlatformIO Core installation...',
       });
 
-      const im = new InstallationManager(this._context.globalState);
+      const im = new InstallationManager(this.context.globalState);
       if (im.locked()) {
         vscode.window.showInformationMessage(
           'PlatformIO IDE installation has been suspended, because PlatformIO '
@@ -114,11 +123,11 @@ class PlatformIOVSCodeExtension {
         progress.report({
           message: 'Installing PlatformIO IDE...',
         });
-        const outputChannel = vscode.window.createOutputChannel('PlatformIO Instalation');
+        const outputChannel = vscode.window.createOutputChannel('PlatformIO Installation');
         outputChannel.show();
 
         outputChannel.appendLine('Installing PlatformIO Core...');
-        outputChannel.appendLine('Please don\'t close this window and don\'t '
+        outputChannel.appendLine('Please do not close this window and do not '
           + 'open other folders until this process is completed.');
 
         try {
@@ -153,30 +162,18 @@ class PlatformIOVSCodeExtension {
   }
 
   registerCommands() {
-    // PIO Home
-    this._context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(
-      'platformio-home',
-      new HomeContentProvider())
-    );
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.showHome',
-      () => vscode.commands.executeCommand(
-        'vscode.previewHtml',
-        vscode.Uri.parse('platformio-home://'),
-        vscode.ViewColumn.One,
-        this.getEnterpriseSetting('pioHomeTitle', 'PIO Home')
-      )
+      () => this.pioHome.toggle()
     ));
-
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.build',
-      async () => {
-        vscode.commands.executeCommand(
-          'workbench.action.tasks.runTask',
-          `PlatformIO: ${this.getConfig().get('defaultToolbarBuildAction') === 'pre-debug' ? 'Pre-Debug' : 'Build'}`);
-      }
+      () => vscode.commands.executeCommand(
+        'workbench.action.tasks.runTask',
+        `PlatformIO: ${this.getConfig().get('defaultToolbarBuildAction') === 'pre-debug' ? 'Pre-Debug' : 'Build'}`
+      )
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.upload',
       async () => {
         await this.terminateMonitorTask();
@@ -189,26 +186,22 @@ class PlatformIOVSCodeExtension {
         vscode.commands.executeCommand('workbench.action.tasks.runTask', task);
       }
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.remote',
-      async () => {
-        vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Remote');
-      }
+      () => vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Remote')
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.test',
       async () => {
         await this.terminateMonitorTask();
         vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Test');
       }
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.clean',
-      async () => {
-        vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Clean');
-      }
+      () => vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Clean')
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.serialMonitor',
       async () => {
         await this.terminateMonitorTask();
@@ -216,15 +209,15 @@ class PlatformIOVSCodeExtension {
         vscode.commands.executeCommand('workbench.action.tasks.runTask', 'PlatformIO: Monitor');
       }
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.newTerminal',
       () => this.pioTerm.new().show()
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.updateCore',
       () => this.pioTerm.sendText('pio update')
     ));
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.upgradeCore',
       () => this.pioTerm.sendText('pio upgrade')
     ));
@@ -243,8 +236,12 @@ class PlatformIOVSCodeExtension {
     return new Promise(resolve => setTimeout(() => resolve(), 500));
   }
 
+  initDebug() {
+    piodebug.activate(this.context);
+  }
+
   initTasksProvider() {
-    this._context.subscriptions.push(new PIOTasksProvider(vscode.workspace.rootPath));
+    this.context.subscriptions.push(new PIOTasksProvider(vscode.workspace.rootPath));
   }
 
   initStatusBar({ filterCommands, ignoreCommands }) {
@@ -259,7 +256,7 @@ class PlatformIOVSCodeExtension {
       ['$(plug)', 'PlatformIO: Serial Monitor', 'platformio-ide.serialMonitor'],
       ['$(terminal)', 'PlatformIO: New Terminal', 'platformio-ide.newTerminal']
     ]
-      .filter(item => (!filterCommands || filterCommands.includes(item[2])) && (!ignoreCommands || !ignoreCommands.includes(item[2])) )
+      .filter(item => (!filterCommands || filterCommands.includes(item[2])) && (!ignoreCommands || !ignoreCommands.includes(item[2])))
       .reverse()
       .forEach((item, index) => {
         const [text, tooltip, command] = item;
@@ -268,26 +265,24 @@ class PlatformIOVSCodeExtension {
         sbItem.tooltip = tooltip;
         sbItem.command = command;
         sbItem.show();
-        this._context.subscriptions.push(sbItem);
+        this.context.subscriptions.push(sbItem);
       });
   }
 
   initProjectIndexer() {
     const indexer = new ProjectIndexer(vscode.workspace.rootPath);
-    this._context.subscriptions.push(indexer);
-    this._context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => indexer.toggle()));
-    indexer.toggle();
-    this._context.subscriptions.push(vscode.commands.registerCommand(
+    this.context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => indexer.toggle()));
+    this.context.subscriptions.push(vscode.commands.registerCommand(
       'platformio-ide.rebuildProjectIndex',
       () => indexer.doRebuild({
         verbose: true
       })
     ));
+    this.context.subscriptions.push(indexer);
+    indexer.toggle();
   }
 
   deactivate() {
-    this.pioTerm.dispose();
-    HomeContentProvider.shutdownServer();
   }
 }
 
@@ -300,4 +295,5 @@ export function activate(context) {
 
 export function deactivate() {
   extension.deactivate();
+  piodebug.deactivate();
 }
diff --git a/syntaxes/assembly-configuration.json b/syntaxes/assembly-configuration.json
new file mode 100644
index 0000000..842a88d
--- /dev/null
+++ b/syntaxes/assembly-configuration.json
@@ -0,0 +1,26 @@
+{
+    "comments": {
+        // symbol used for single line comment. Remove this entry if your language does not support line comments
+        "lineComment": ";"
+    },
+    // symbols used as brackets
+    "brackets": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
+    // symbols that are auto closed when typing
+    "autoClosingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["\"", "\""]
+    ],
+    // symbols that that can be used to surround a selection
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["\"", "\""]
+    ]
+}
\ No newline at end of file
diff --git a/syntaxes/assembly.tmLanguage b/syntaxes/assembly.tmLanguage
new file mode 100644
index 0000000..c1eb751
--- /dev/null
+++ b/syntaxes/assembly.tmLanguage
@@ -0,0 +1,1675 @@
+<?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>fileTypes</key>
+	<array>
+		<string>asm</string>
+		<string>nasm</string>
+		<string>yasm</string>
+		<string>inc</string>
+		<string>s</string>
+	</array>
+	<key>name</key>
+	<string>Assembly</string>
+	<key>patterns</key>
+	<array>
+		<dict>
+			<key>include</key>
+			<string>#registers</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#mnemonics</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#constants</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#entities</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#support</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#comments</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#preprocessor</string>
+		</dict>
+		<dict>
+			<key>include</key>
+			<string>#strings</string>
+		</dict>
+	</array>
+	<key>repository</key>
+	<dict>
+		<key>comments</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>(;|(^|\s)#\s).*$</string>
+					<key>name</key>
+					<string>comment.line</string>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>/\*</string>
+					<key>end</key>
+					<string>\*/</string>
+					<key>name</key>
+					<string>comment.block</string>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>^\s*[\#%]\s*if\s+0\b</string>
+					<key>end</key>
+					<string>^\s*[\#%]\s*endif\b</string>
+					<key>name</key>
+					<string>comment.preprocessor</string>
+				</dict>
+			</array>
+		</dict>
+		<key>constants</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b((([0-9\_]+\.[0-9\_]*)(e[+-]?[0-9\_]+)?|\.?[0-9\_]+e[+-]?[0-9\_]+))\b</string>
+					<key>name</key>
+					<string>constant.numeric.floating-point</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b([0-9\_]+p[0-9\_]*)\b</string>
+					<key>name</key>
+					<string>constant.numeric.packed-bcd</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>(\$0[0-9a-f]+)\b</string>
+					<key>name</key>
+					<string>constant.numeric.literal</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((0[by][01\_]+)|([01\_]+[by]))\b</string>
+					<key>name</key>
+					<string>constant.numeric.bin</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((0[oq][0-7\_]+)|([0-7\_]+[oq]))\b</string>
+					<key>name</key>
+					<string>constant.numeric.oct</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((0d[0-9\_]+)|([0-9\_]+d?))\b</string>
+					<key>name</key>
+					<string>constant.numeric.dec</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((0[xh][0-9a-fA-F\_]+)|([0-9a-fA-F\_]+[hH]))\b</string>
+					<key>name</key>
+					<string>constant.numeric.hex</string>
+				</dict>
+			</array>
+		</dict>
+		<key>entities</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>((section|segment)\s+)?\.((ro)?data|bss|text)</string>
+					<key>name</key>
+					<string>entity.name.section</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>^\s*(%%)?(\w|[\._?])(\w|[_$#@~\.?])*\:</string>
+					<key>name</key>
+					<string>entity.name.function</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>^\s*([$@~])(\w|[_$#@~\.?])*\:</string>
+					<key>name</key>
+					<string>invalid.entity.name.function</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\$</string>
+					<key>name</key>
+					<string>entity.label.special</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>^\.?(globa?l|extern)\b</string>
+					<key>name</key>
+					<string>entity.directive</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>(\$\w+)\b</string>
+					<key>name</key>
+					<string>text.variable</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-general-purpose</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-fpu</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-mmx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-sse</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-sse2</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-sse3</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-sse4</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-aesni</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-avx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-avx2</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-tsx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-system</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-64bit</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-vmx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-smx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-intel-isa-sgx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-intel-isa-mpx</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-intel-isa-sha</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-supplemental-amd</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-supplemental-cyrix</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-supplemental-via</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-undocumented</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-future-intel</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-pseudo-ops</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-64bit</key>
+		<dict>
+			<key>match</key>
+			<string>\b(cdqe|cqo|(cmp|lod|mov|sto)sq|cmpxchg16b|mov(ntq|sxd)|scasq|swapgs|sys(call|ret))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.64-bit-mode</string>
+		</dict>
+		<key>mnemonics-aesni</key>
+		<dict>
+			<key>match</key>
+			<string>\b(aes((dec|enc)(last)?|imc|keygenassist)|pclmulqdq)\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.aesni</string>
+		</dict>
+		<key>mnemonics-avx</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(v((test|permil|maskmov)p[ds]|zero(all|upper)|(perm2|insert|extract|broadcast)f128|broadcasts[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vaes((dec|enc)(last)?|imc|keygenassist)|vpclmulqdq)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.aes</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v((cmp[ps]|u?comis)[ds]|pcmp([ei]str[im]|(eq|gt)[bdqw])))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(cvt(dq2pd|dq2ps|pd2ps|ps2pd|sd2ss|si2sd|si2ss|ss2sd|t?(pd2dq|ps2dq|sd2si|ss2si))))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vh((add|sub)p[ds])|vph((add|sub)([dw]|sw)|minposuw))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.horizontal-packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v((andn?|x?or)p[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(mov(([ahl]|msk|nt|u)p[ds]|(hl|lh)ps|s([ds]|[hl]dup)|q)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v((add|div|mul|sub|max|min|round|sqrt)[ps][ds]|(addsub|dp)p[ds]|(rcp|rsqrt)[ps]s))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(pack[su]s(dw|wb)|punpck[hl](bw|dq|wd|qdq)|unpck[hl]p[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.packed-conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(shuf([bd]|[hl]w))|vshufp[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.packed-shuffle</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp((abs|sign|(max|min)[su])[bdw]|(add|sub)([bdqw]|u?s[bw])|avg[bw]|extr[bdqw]|madd(wd|ubsw)|mul(hu?w|hrsw|l[dw]|u?dq)|sadbw))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.supplemental.arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(andn?|x?or))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.supplemental.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpblend(vb|w))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.supplemental.blending</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpmov(mskb|[sz]x(b[dqw]|w[dq]|dq)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.supplemental.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(insr[bdqw]|sll(dq|[dqw])|srl(dq)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.simd-integer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(sra[dw]|srl[dqw]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.shift-and-rotate</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vblendv?p[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.packed-blending</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(test|alignr))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.packed-other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vmov(d(dup|qa|qu)?))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.simd-integer.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v((extract|insert)ps|lddqu|(ld|st)mxcsr|mpsadbw))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(maskmovdqu|movntdqa?))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx.promoted.cacheability-control</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vcvt(ph2ps|ps2ph))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.16-bit-floating-point-conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vfn?m((add|sub)(132|213|231)[ps][ds])|vfm((addsub|subadd)(132|213|231)p[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fma</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-avx2</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(v((broadcast|extract|insert|perm2)i128|pmaskmov[dq]|perm([dsq]|p[sd])))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx2.promoted.simd</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpbroadcast[bdqw])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx2.promoted.packed</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(blendd|s[lr]lv[dq]|sravd))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx2.blend</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp?gather[dq][dq]|vgather([dq]|dq)p[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx2.gather</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-fpu</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(fcmov(n?([beu]|be)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.data-transfer.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f(i?(ld|stp?)|b(ld|stp)|xch))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.data-transfer.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f((add|div|mul|sub)p?|i(add|div|mul|sub)|(div|sub)rp?|i(div|sub)r))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.basic-arithmetic.basic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f(prem1?|abs|chs|rndint|scale|sqrt|xtract))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.basic-arithmetic.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f(u?com[ip]?p?|icomp?|tst|xam))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f(sin|cos|sincos|pa?tan|2xm1|yl2x(p1)?))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.transcendental</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(fld(1|z|pi|l2[et]|l[ng]2))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.load-constants</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(f((inc|dec)stp|free|n?(init|clex|st[cs]w|stenv|save)|ld(cw|env)|rstor|nop)|f?wait)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.control-management</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(fx(save|rstor)(64)?)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.fpu.state-management</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-future-intel</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-future-intel-avx512</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-future-intel-opmask</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-future-intel-cet</string>
+				</dict>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-future-intel-other</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-future-intel-avx512</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(vblendm(pd|ps)|vpblendm[bdqw])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.blend</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vbroadcast[fi](32x[248]|64x[24])|v(extract|insert)[fi](32x[48]|64x[24])|vshuf[fi](32x4|64x2)|vpbroadcastm(b2q|w2d))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.bits-mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(compress|expand)p[ds]|vp(compress|expand|conflict)[dq])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.compress</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vcvt(t?p[sd]2(udq|u?qq)|(udq|u?qq)2p[ds]|t?s[ds]2usi|usi2s[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(fixupimm|fpclass|get(exp|mant)|range|(rcp|rsqrt)(14|28)|reduce|rndscale|scalef)([ps][ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.math</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v(exp2p[ds]|(scatter|(gather|scatter)pf[01])[dq]p[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.math</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vmovdq(a(32|64)|u(8|16|32|64)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.simd-integer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(andn?|x?or)[dq])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpcmpu?[dqw])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.packed-comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(absq|(lzcnt|ternlog)[dq]|madd52[lh]uq|(max|min)[su]q|mullq))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.packed-math</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpmov(m2[bdqw]|[bdqw]2m|(u?s)?([qd][bw]|qd|wb)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.packed-mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(ro[rl]v?[dq]|scatter[dq][dq]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.packed-shift</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vptestn?m[bdqw])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.packed-test</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vperm([bdw]|[it]2([bdwq]|p[ds])))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.permutations</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(valign[dq]|vdbpsadbw|vpmultishiftqb|vpsrav[dqw])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.avx512.other</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-future-intel-cet</key>
+		<dict>
+			<key>match</key>
+			<string>\b((inc|save|rstor)ssp|wru?ss|(set|clr)ssbsy|endbranch|endbr(32|64))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.cet</string>
+		</dict>
+		<key>mnemonics-future-intel-opmask</key>
+		<dict>
+			<key>match</key>
+			<string>\b(k(add|andn?|(xn?)?or|mov|not|(or)?test|shift[lr])[bdqw]|kunpck(bw|wd|dq))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.opmask</string>
+		</dict>
+		<key>mnemonics-future-intel-other</key>
+		<dict>
+			<key>match</key>
+			<string>\b(clflushopt|clwb|pcommit)\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.other</string>
+		</dict>
+		<key>mnemonics-general-purpose</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(mov([sz]x)?|cmov(n?[abceglopsz]|n?[abgl]e|p[eo]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.data-transfer.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(xchg|bswap|xadd|cmpxchg(8b)?)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.data-transfer.xchg</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((push|pop)(ad?)?|cwde?|cdq|cbw)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.data-transfer.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(adcx?|adox|add|sub|sbb|i?mul|i?div|inc|dec|neg|cmp)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.binary-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(daa|das|aaa|aas|aam|aad)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.decimal-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(and|x?or|not)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(s[ah][rl]|sh[rl]d|r[co][rl])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.rotate</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(set(n?[abceglopsz]|n?[abgl]e|p[eo]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.bit-and-byte.set</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(bt[crs]?|bs[fr]|test|crc32|popcnt)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.bit-and-byte.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(jmp|jn?[abceglopsz]|jn?[abgl]e|jp[eo]|j[er]?cxz)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.control-transfer.jmp</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(loop(n?[ez])?|call|ret|iret[dq]?|into?|bound|enter|leave)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.control-transfer.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((mov|cmp|sca|lod|sto)(s[bdw]?)|rep(n?[ez])?)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.strings</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((in|out)(s[bdw]?)?)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.io</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((st|cl)[cdi]|cmc|[ls]ahf|(push|pop)f[dq]?)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.flag-control</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(l[defgs]s)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.segment-registers</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(lea|nop|ud2|xlatb?|cpuid|movbe)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.misc</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(rdrand|rdseed)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.rng</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(andn|bextr|bls(i|r|msk)|bzhi|pdep|pext|[lt]zcnt|(mul|ror|sar|shl|shr)x)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.general-purpose.bmi</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-intel-isa-mpx</key>
+		<dict>
+			<key>match</key>
+			<string>\b(bnd(mk|c[lnu]|mov|ldx|stx))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.mpx</string>
+		</dict>
+		<key>mnemonics-intel-isa-sgx</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\be(add|block|create|dbg(rd|wr)|extend|init|ld[bu]|pa|remove|track|wb)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sgx1.supervisor</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\be(enter|exit|getkey|report|resume)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sgx1.user</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\be(aug|mod(pr|t))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sgx2.supervisor</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\be(accept(copy)?|modpe)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sgx2.user</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-intel-isa-sha</key>
+		<dict>
+			<key>match</key>
+			<string>\b(sha(1rnds4|256rnds2|1nexte|(1|256)msg[12]))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.sha</string>
+		</dict>
+		<key>mnemonics-invalid</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>include</key>
+					<string>#mnemonics-invalid-amd-sse5</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-invalid-amd-sse5</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(com[ps][ds]|pcomu?[bdqw])\b</string>
+					<key>name</key>
+					<string>invalid.keyword.mnemonic.sse5.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(cvtp(h2ps|s2ph)|frcz[ps][ds])\b</string>
+					<key>name</key>
+					<string>invalid.keyword.mnemonic.sse5.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(fn?m((add|sub)[ps][ds])|ph(addu?(b[dqw]|w[dq]|dq)|sub(bw|dq|wd))|pma(css?(d(d|q[hl])|w[dw])|dcss?wd))\b</string>
+					<key>name</key>
+					<string>invalid.keyword.mnemonic.sse5.packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pcmov|permp[ds]|pperm|prot[bdqw]|psh[al][bdqw])\b</string>
+					<key>name</key>
+					<string>invalid.keyword.mnemonic.sse5.simd-integer</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-mmx</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(mov[dq])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.data-transfer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pack(ssdw|[su]swb)|punpck[hl](bw|dq|wd))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p(((add|sub)(d|(u?s)?[bw]))|maddwd|mul[lh]w))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pcmp((eq|gt)[bdw]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pandn?|px?or)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(ps([rl]l[dwq]|raw|rad))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.shift-and-rotate</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(emms)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.mmx.state-management</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-pseudo-ops</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(cmp(n?(eq|lt|le)|(un)?ord)[ps][ds])\b</string>
+					<key>name</key>
+					<string>keyword.pseudo-mnemonic.sse2.compare</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(v?pclmul([hl]q[hl]q|[hl]qh)dq)\b</string>
+					<key>name</key>
+					<string>keyword.pseudo-mnemonic.avx.promoted.aes</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vcmp(eq(_(os|uq|us))?|neq(_(oq|os|us))?|[gl][et](_oq)?|n[gl][et](_uq)?|(un)?ord(_s)?|false(_os)?|true(_us)?)[ps][ds])\b</string>
+					<key>name</key>
+					<string>keyword.pseudo-mnemonic.avx.promoted.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vpcom(n?eq|[gl][et]|false|true)(b|uw))\b</string>
+					<key>name</key>
+					<string>keyword.pseudo-mnemonic.supplemental.amd.xop.simd</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-smx</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(getsec)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.smx.getsec</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(capabilities|enteraccs|exitac|senter|sexit|parameters|smctrl|wakeup)\b</string>
+					<key>name</key>
+					<string>support.constant</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-sse</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(mov(([ahlu]|hl|lh|msk)ps|ss))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.data-transfer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((add|div|max|min|mul|rcp|r?sqrt|sub)[ps]s)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(cmp[ps]s|u?comiss)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.comparison</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((andn?|x?or)ps)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((shuf|unpck[hl])ps)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.shuffle-and-unpack</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(cvt(pi2ps|si2ss|ps2pi|tps2pi|ss2si|tss2si))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((ld|st)mxcsr)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.state-management</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p(avg[bw]|extrw|insrw|(max|min)(sw|ub)|sadbw|shufw|mulhuw|movmskb))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.simd-integer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(maskmovq|movntps|sfence)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.cacheability-control</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(prefetch(nta|t[0-2]|w(t1)?))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse.prefetch</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-sse2</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(mov([auhl]|msk)pd)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.data-transfer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((add|div|max|min|mul|sub|sqrt)[ps]d)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((andn?|x?or)pd)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.logical</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((cmpp|u?comis)d)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.compare</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((shuf|unpck[hl])pd)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.shuffle-and-unpack</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(cvt(dq2pd|pi2pd|ps2pd|pd2ps|si2sd|sd2ss|ss2sd|t?(pd2dq|pd2pi|sd2si)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(cvt(dq2ps|ps2dq|tps2dq))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.packed-floating-point</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(mov(dq[au]|q2dq|dq2q))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.simd-integer.mov</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p((add|sub|(s[lr]l|mulu|unpck[hl]q)d)q|shuf(d|[hl]w)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.simd-integer.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(clflush|[lm]fence|pause|maskmovdqu|movnt(dq|i|pd))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse2.cacheability-control</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-sse3</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(fisttp|lddqu|(addsub|h(add|sub))p[sd]|mov(sh|sl|d)dup|monitor|mwait)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse3</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(ph(add|sub)(s?w|d))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse3.supplimental.horizontal-packed-arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p((abs|sign)[bdw]|maddubsw|mulhrsw|shufb|alignr))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse3.supplimental.other</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-sse4</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(pmul(ld|dq)|dpp[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.arithmetic</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(movntdqa)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.load-hint</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(blendv?p[ds]|pblend(vb|w))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.packed-blending</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p(min|max)(u[dw]|s[bd]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.packed-integer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(round[ps][sd])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.packed-floating-point</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((extract|insert)ps|p((ins|ext)(r[bdq])))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.insertion-and-extraction</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pmov([sz]x(b[dqw]|dq|wd|wq)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.conversion</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(mpsadbw|phminposuw|ptest|pcmpeqq|packusdw)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.1.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pcmp([ei]str[im]|gtq))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.sse4.2</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-supplemental-amd</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(bl([cs](fill|ic?|msk)|cs)|t1mskc|tzmsk)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.general-purpose</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(clgi|int3|invlpga|iretw|skinit|stgi|vm(load|mcall|run|save)|monitorx|mwaitx)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.system</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b([ls]lwpcb|lwp(ins|val))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.profiling</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(movnts[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.memory-management</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(prefetch|clzero)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.cache-management</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b((extr|insert)q)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.sse4.a</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vfn?m((add|sub)[ps][ds])|vfm((addsub|subadd)p[ds]))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.fma4</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vp(cmov|(comu?|rot|sh[al])[bdqw]|mac(s?s(d(d|q[hl])|w[dw]))|madcss?wd|perm))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.xop.simd</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vph(addu?(b[dqw]|w[dq]|dq)|sub(bw|dq|wd)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.xop.simd-horizontal</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(vfrcz[ps][ds]|vpermil2p[ds])\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.xop.other</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(femms)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.3dnow</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(p(avgusb|(f2i|i2f)[dw]|mulhrw|swapd)|pf((p?n)?acc|add|max|min|mul|rcp(it[12])?|rsqit1|rsqrt|subr?))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.3dnow.simd</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(pfcmp(eq|ge|gt))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.amd.3dnow.comparison</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-supplemental-cyrix</key>
+		<dict>
+			<key>match</key>
+			<string>\b((sv|rs)dc|(wr|rd)shr)\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.supplemental.cyrix</string>
+		</dict>
+		<key>mnemonics-supplemental-via</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b(montmul)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.via</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(x(store(rng)?|crypt(ecb|cbc|ctr|cfb|ofb)|sha(1|256)))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.supplemental.via.padlock</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-system</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b((cl|st)ac|[ls]([gli]dt|tr|msw)|clts|arpl|lar|lsl|ver[rw]|inv(d|lpg|pcid)|wbinvd)\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.system</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(lock|hlt|rsm|(rd|wr)(msr|pkru|[fg]sbase)|rd(pmc|tscp?)|sys(enter|exit))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.system</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(x((save(c|opt|s)?|rstors?)(64)?|[gs]etbv))\b</string>
+					<key>name</key>
+					<string>keyword.mnemonic.system</string>
+				</dict>
+			</array>
+		</dict>
+		<key>mnemonics-tsx</key>
+		<dict>
+			<key>match</key>
+			<string>\b(x(abort|acquire|release|begin|end|test))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.tsx</string>
+		</dict>
+		<key>mnemonics-undocumented</key>
+		<dict>
+			<key>match</key>
+			<string>\b(ret[nf]|icebp|int1|smi)\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.undocumented</string>
+		</dict>
+		<key>mnemonics-vmx</key>
+		<dict>
+			<key>match</key>
+			<string>\b(vm(ptr(ld|st)|clear|read|write|launch|resume|xo(ff|n)|call|func)|inv(ept|vpid))\b</string>
+			<key>name</key>
+			<string>keyword.mnemonic.vmx</string>
+		</dict>
+		<key>preprocessor</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>^\s*[#%]\s*(error|warning)\b</string>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.control.import.error.c</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>$</string>
+					<key>name</key>
+					<string>meta.preprocessor.diagnostic.c</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>(?&gt;\\\s*\n)</string>
+							<key>name</key>
+							<string>punctuation.separator.continuation.c</string>
+						</dict>
+					</array>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>^\s*[#%]\s*(include|import)\b\s+</string>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.control.import.include.c</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>(?=(?://|/\*))|$</string>
+					<key>name</key>
+					<string>meta.preprocessor.c.include</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>(?&gt;\\\s*\n)</string>
+							<key>name</key>
+							<string>punctuation.separator.continuation.c</string>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>"</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.string.begin.c</string>
+								</dict>
+							</dict>
+							<key>end</key>
+							<string>"</string>
+							<key>endCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.string.end.c</string>
+								</dict>
+							</dict>
+							<key>name</key>
+							<string>string.quoted.double.include.c</string>
+						</dict>
+						<dict>
+							<key>begin</key>
+							<string>&lt;</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.string.begin.c</string>
+								</dict>
+							</dict>
+							<key>end</key>
+							<string>&gt;</string>
+							<key>endCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.string.end.c</string>
+								</dict>
+							</dict>
+							<key>name</key>
+							<string>string.quoted.other.lt-gt.include.c</string>
+						</dict>
+					</array>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>^\s*[%#]\s*((xi?)?define|defined|elif(def)?|else|if(macro|ctx|idni?|num|str)?|ifn?def|line|(end)?macro|pragma|undef|endif)\b</string>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.control.import.c</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>(?=(?://|/\*))|$</string>
+					<key>name</key>
+					<string>meta.preprocessor.c</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>(?&gt;\\\s*\n)</string>
+							<key>name</key>
+							<string>punctuation.separator.continuation.c</string>
+						</dict>
+					</array>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>^\s*[#%]\s*(assign|strlen|substr|(end|exit)?rep|push|pop)\b</string>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>keyword.control</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>$</string>
+					<key>name</key>
+					<string>meta.preprocessor.nasm</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>(?&gt;\\\s*\n)</string>
+							<key>name</key>
+							<string>punctuation.separator.continuation.c</string>
+						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
+		<key>registers</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>\b%?([abcd][hl]|[er]?[abcd]x|[er]?(di|si|bp|sp)|dil|sil|bpl|spl|r(8|9|1[0-5])[bdlw]?)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.general-purpose</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?([cdefgs]s)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.segment</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?([er]?flags)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.flags</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?([er]?ip)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.instruction-pointer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(cr[02-4])\b</string>
+					<key>name</key>
+					<string>constant.language.registers.control</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?((mm|st|fpr)[0-7])\b</string>
+					<key>name</key>
+					<string>constant.language.registers.mmx</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?([xy]mm([0-9]|1[0-5])|mxcsr)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.sse_avx</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(zmm([12]?[0-9]|30|31))\b</string>
+					<key>name</key>
+					<string>constant.language.registers.avx512</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(bnd([0-3]|cfg[su]|status))\b</string>
+					<key>name</key>
+					<string>constant.language.registers.memory-protection</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(([gil]dt)r?|tr)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.system-table-pointer</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(dr[0-367])\b</string>
+					<key>name</key>
+					<string>constant.language.registers.debug</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(cr8|dr([89]|1[0-5])|efer|tpr|syscfg)\b</string>
+					<key>name</key>
+					<string>constant.language.registers.amd</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b%?(db[0-367]|t[67]|tr[3-7]|st)\b</string>
+					<key>name</key>
+					<string>invalid.deprecated</string>
+				</dict>
+			</array>
+		</dict>
+		<key>strings</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>["'`]</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.string.begin.asm</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>["'`]</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.string.end.asm</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>string.quoted.asm</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#string_escaped_char</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#string_placeholder</string>
+						</dict>
+					</array>
+				</dict>
+				<dict>
+					<key>begin</key>
+					<string>'</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.string.begin.c</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>'</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.string.end.c</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>string.quoted.single.c</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#string_escaped_char</string>
+						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
+		<key>support</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>match</key>
+					<string>(?i)\b(s?byte|([doqtyz]|dq|s[dq]?)?word|(d|res)[bdoqtwyz]?|ddq|incbin|equ|times|(end|i)?struc|at|iend)\b</string>
+					<key>name</key>
+					<string>support.type.asm</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>(?i)\b(\.?(alignb?|bits|cpu|fpu)|use(16|32|64))\b</string>
+					<key>name</key>
+					<string>support.directive.asm</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b(strict|nosplit|near|far|abs|rel|seg|wrt|absolute|common)\b</string>
+					<key>name</key>
+					<string>support.modifier.asm</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b([ao](16|32|64))\b</string>
+					<key>name</key>
+					<string>support.prefix.asm</string>
+				</dict>
+				<dict>
+					<key>match</key>
+					<string>\b__(utf((16|32)([lb]e)?)|float(8|16|32|64|80[me]|128[lh])|Infinity|[QS]?NaN)__\b</string>
+					<key>name</key>
+					<string>support.function.asm</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>scopeName</key>
+	<string>source.platformio-debug-asm</string>
+	<key>uuid</key>
+	<string>05d6565d-991a-4e88-8e13-63bb21197f32</string>
+</dict>
+</plist>
diff --git a/syntaxes/platformio-debug-disassembly.json b/syntaxes/platformio-debug-disassembly.json
new file mode 100755
index 0000000..a44ae0c
--- /dev/null
+++ b/syntaxes/platformio-debug-disassembly.json
@@ -0,0 +1,30 @@
+{
+    "name": "PlatformIO Debugger Disassembly",
+    "scopeName": "source.platformio-debug-disassembly",
+    "patterns": [
+        {
+            "comment": "Address, bytes and opcode",
+            "name": "meta.instruction",
+            "match": "^(0x[A-Za-z0-9]{8}):\\s([a-zA-Z0-9]{2}\\s)+\\s+([\\w\\.]+)",
+            "captures": {
+                "1": { "name": "constant.numeric" },
+                "3": { "name": "keyword.opcode" }
+            }
+        },
+        {
+            "comment": "Numeric constant",
+            "name": "constant.numeric",
+            "match": "(0x[0-9A-F]+)|(#[0-9]+)"
+        },
+        {
+            "comment": "Register",
+            "name": "variable.language",
+            "match": "\b((r[0-9])|(r1[0-5])|(sp)|(lr)|(pc)|(xpsr)|(msp)|(psp)|(primask)|(basepri)|(s[0-9])|(s[1-2][0-9])|(s3[0-1]))\b"
+        },
+        {
+            "comment": "End of line comment",
+            "name": "comment.line.semicolon",
+            "match": ";.*$"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/syntaxes/platformio-debug-memoryview.json b/syntaxes/platformio-debug-memoryview.json
new file mode 100755
index 0000000..a57489b
--- /dev/null
+++ b/syntaxes/platformio-debug-memoryview.json
@@ -0,0 +1,21 @@
+{
+    "name": "PlatformIO Debugger Memory View",
+    "scopeName": "source.platformio-debug-memoryview",
+    "patterns": [
+        {
+            "comment": "Heading",
+            "name": "keyword.header.hex",
+            "match": "^  Offset: 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F \\t$"
+        },
+        {
+            "comment": "Address",
+            "name": "keyword.address.hex",
+            "match": "^([a-fA-F\\d]{8}:)"
+        },
+        {
+            "comment": "ASCII",
+            "name": "comment.ascii.hex",
+            "match": "  [^\\s]*$"
+        }
+    ]
+}
\ No newline at end of file