diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
index d8d68b95..bf9da38b 100644
--- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
+++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx
@@ -42,6 +42,8 @@ import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
 import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
 import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { EditorMode } from './editor-mode';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 
 export namespace ArduinoMenus {
     export const SKETCH = [...MAIN_MENU_BAR, '3_sketch'];
@@ -57,7 +59,7 @@ export namespace ArduinoToolbarContextMenu {
 
 @injectable()
 export class ArduinoFrontendContribution implements FrontendApplicationContribution,
-    TabBarToolbarContribution, CommandContribution, MenuContribution, KeybindingContribution {
+    TabBarToolbarContribution, CommandContribution, MenuContribution, KeybindingContribution, ColorContribution {
 
     @inject(MessageService)
     protected readonly messageService: MessageService;
@@ -577,4 +579,189 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
         return undefined;
     }
 
+    registerColors(colors: ColorRegistry): void {
+        colors.register(
+            {
+                id: 'arduino.base',
+                defaults: {
+                    dark: '#616161',
+                    light: '#616161',
+                    hc: '#FFFFFF'
+                },
+                description: 'Base layout color.'
+            },
+            {
+                id: 'arduino.toolbarTooltip',
+                defaults: {
+                    dark: '#616161',
+                    light: '#616161',
+                    hc: '#FFFFFF'
+                },
+                description: 'The color of the toolbar tooltip (shown next to the buttons).'
+            },
+            {
+                id: 'arduino.editorMargin',
+                defaults: {
+                    dark: '#2e2e2e',
+                    light: '#EEEEEE',
+                    hc: 'contrastBorder'
+                },
+                description: 'The color of the border which separates line numbers from code area.'
+            },
+            {
+                id: 'arduino.dialogTitle',
+                defaults: {
+                    dark: 'foreground',
+                    light: 'foreground',
+                    hc: 'contrastBorder'
+                },
+                description: 'The color of a dialog title (e.g. in board selector dialog).'
+            },
+            {
+                id: 'arduino.select',
+                defaults: {
+
+                },
+                description: 'Color of background and border of select component (in serial monitor).'
+            },
+            {
+                id: 'arduino.selectItemHoverBackground',
+                defaults: {
+                    light: '#d7eaf8',
+                    dark: '#24455e'
+                },
+                description: 'Color of background of hovered Item in select component (in serial monitor).'
+            },
+            {
+                id: 'arduino.dialogSecondaryTitle',
+                defaults: {
+                    dark: '#7f8c8d',
+                    light: '#7f8c8d'
+                },
+                description: 'Color of secondary titles in Arduino Dialogs.'
+            },
+            {
+                id: 'arduino.secondaryButtonShadow',
+                defaults: {
+                    dark: '#95a5a6',
+                    light: '#95a5a6'
+                },
+                description: 'Color of secondary button shadow.'
+            },
+            {
+                id: 'arduino.buttonShadow',
+                defaults: {
+                    dark: '#006468',
+                    light: '#006468'
+                },
+                description: 'Color of button shadow.'
+            },
+            {
+                id: 'arduino.toolbarItemForeground',
+                defaults: {
+                    dark: 'button.foreground',
+                    light: 'button.foreground'
+                },
+                description: 'Foreground color of toolbar items.'
+            },
+            {
+                id: 'arduino.boardSelectorBackground',
+                defaults: {
+                    dark: 'editorWidget.background',
+                    light: 'editorWidget.background',
+                    hc: 'editorWidget.background'
+                },
+                description: 'Background color of board selector toolbar item.'
+            },
+            {
+                id: 'arduino.boardSelectorHoverBackground',
+                defaults: {
+                    dark: '#383838',
+                    light: '#dae2e4'
+                },
+                description: 'Background color of board selector toolbar item.'
+            },
+            {
+                id: 'arduino.boardSelectorBorder',
+                defaults: {
+                    dark: '#757575',
+                    light: '#e0e0e0'
+                },
+                description: 'Border color of board selector toolbar item.'
+            },
+            {
+                id: 'arduino.boardSelectorCheck',
+                defaults: {
+                    dark: '#259fd8',
+                    light: '#2b75c0'
+                },
+                description: 'Color of board selector toolbar check item.'
+            },
+            {
+                id: 'arduino.listOddItem',
+                defaults: {
+                    dark: '#1d1d1d',
+                    light: '#ffffff'
+                },
+                description: 'Backgroundcolor of item with odd number in list widget'
+            },
+            {
+                id: 'arduino.listEvenItem',
+                defaults: {
+                    dark: '#252526',
+                    light: '#f7f9f9'
+                },
+                description: 'Backgroundcolor of item with even number in list widget'
+            },
+            {
+                id: 'arduino.listItemHoverBackground',
+                defaults: {
+                    dark: '#333333',
+                    light: '#ececec'
+                },
+                description: 'Backgroundcolor of hovered item in list widget'
+            },
+            {
+                id: 'arduino.listItemSecondaryForeground',
+                defaults: {
+                    dark: '#9e9e9e',
+                    light: '#9e9e9e'
+                },
+                description: 'Backgroundcolor of hovered item in list widget'
+            },
+            {
+                id: 'arduino.listItemInstalledBadge',
+                defaults: {
+                    dark: '#259fd8',
+                    light: '#2b75c0'
+                },
+                description: 'Color of badge for installed list items.'
+            },
+            {
+                id: 'arduino.listItemInfoLinkForeground',
+                defaults: {
+                    dark: '#2196f3',
+                    light: '#2196f3'
+                },
+                description: 'Color of info link in list items.'
+            },
+            {
+                id: 'arduino.bottomPanelTabBackground',
+                defaults: {
+                    dark: 'editorGroupHeader.tabsBackground',
+                    light: 'editorGroupHeader.tabsBackground'
+                },
+                description: 'Color of info link in list items.'
+            },
+            {
+                id: 'arduino.toolbarToggleBackground',
+                defaults: {
+                    dark: '#757575',
+                    light: '#9e9e9e'
+                },
+                description: 'Color of active toggles (as in serial monitor toolbar).'
+            }
+        );
+    }
+
 }
diff --git a/arduino-ide-extension/src/browser/arduino-frontend-module.ts b/arduino-ide-extension/src/browser/arduino-frontend-module.ts
index 227ab89c..b577659a 100644
--- a/arduino-ide-extension/src/browser/arduino-frontend-module.ts
+++ b/arduino-ide-extension/src/browser/arduino-frontend-module.ts
@@ -26,8 +26,6 @@ import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl';
 import { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { ArduinoWorkspaceService } from './arduino-workspace-service';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-import { ArduinoTheme } from './arduino-theme';
 import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
 import { ArduinoOutlineViewContribution } from './customization/arduino-outline-contribution';
 import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
@@ -71,9 +69,18 @@ import { ArduinoAboutDialog } from './customization/arduino-about-dialog';
 import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer';
 import { EditorMode } from './editor-mode';
 import { ListItemRenderer } from './components/component-list/list-item-renderer';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
+MonacoThemingService.register({
+    id: 'arduinoTheme',
+    label: 'Arduino Light Theme',
+    uiTheme: 'vs',
+    json: require('../../src/browser/data/arduino.color-theme.json')
+});
+
 export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
     ElementQueries.listen();
     ElementQueries.init();
@@ -85,6 +92,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
     bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
     bind(KeybindingContribution).toService(ArduinoFrontendContribution);
     bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution);
+    bind(ColorContribution).toService(ArduinoFrontendContribution);
 
     bind(ArduinoToolbarContribution).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(ArduinoToolbarContribution);
@@ -200,9 +208,6 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
     bind(ArduinoWorkspaceService).toSelf().inSingletonScope();
     rebind(WorkspaceService).to(ArduinoWorkspaceService).inSingletonScope();
 
-    const themeService = ThemeService.get();
-    themeService.register(...ArduinoTheme.themes);
-
     // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`.
     bind(EditorMode).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(EditorMode);
diff --git a/arduino-ide-extension/src/browser/arduino-theme.ts b/arduino-ide-extension/src/browser/arduino-theme.ts
deleted file mode 100644
index a0198e0a..00000000
--- a/arduino-ide-extension/src/browser/arduino-theme.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-
-import { Theme } from '@theia/core/lib/browser/theming';
-import { MonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
-
-const ARDUINO_CSS = require('../../src/browser/style/arduino.useable.css');
-const ARDUINO_JSON = MonacoThemeRegistry.SINGLETON.register(
-    require('../../src/browser/data/arduino.color-theme.json'), {}, 'arduino', 'vs').name!;
-
-export class ArduinoTheme {
-
-    static readonly arduino: Theme = {
-        type: 'light',
-        id: 'arduino-theme',
-        label: 'Arduino Light Theme',
-        description: 'Arduino Light Theme',
-        editorTheme: ARDUINO_JSON,
-        activate() {
-            ARDUINO_CSS.use();
-        },
-        deactivate() {
-            ARDUINO_CSS.unuse();
-        }
-    };
-
-    static readonly themes: Theme[] = [
-        ArduinoTheme.arduino
-    ];
-
-}
diff --git a/arduino-ide-extension/src/browser/boards/boards-config.tsx b/arduino-ide-extension/src/browser/boards/boards-config.tsx
index fef02883..ec5e375a 100644
--- a/arduino-ide-extension/src/browser/boards/boards-config.tsx
+++ b/arduino-ide-extension/src/browser/boards/boards-config.tsx
@@ -207,7 +207,7 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
 
         return <React.Fragment>
             <div className='search'>
-                <input type='search' placeholder='SEARCH BOARD' onChange={this.updateBoards} ref={this.focusNodeSet} />
+                <input type='search' className='theia-input' placeholder='SEARCH BOARD' onChange={this.updateBoards} ref={this.focusNodeSet} />
                 <i className='fa fa-search'></i>
             </div>
             <div className='boards list'>
diff --git a/arduino-ide-extension/src/browser/components/arduino-select.tsx b/arduino-ide-extension/src/browser/components/arduino-select.tsx
index d9f80a8f..402e9b6e 100644
--- a/arduino-ide-extension/src/browser/components/arduino-select.tsx
+++ b/arduino-ide-extension/src/browser/components/arduino-select.tsx
@@ -16,7 +16,7 @@ export class ArduinoSelect<T> extends Select<T> {
             control: styles => ({
                 ...styles,
                 minWidth: 120,
-                color: 'var(--theia-ui-font-color1)'
+                color: 'var(--theia-foreground)'
             }),
             dropdownIndicator: styles => ({
                 ...styles,
@@ -45,7 +45,7 @@ export class ArduinoSelect<T> extends Select<T> {
                 // `primary50`??? it's crazy but apparently, without this, we would get a light-blueish
                 // color when selecting an option in the select by clicking and then not releasing the button.
                 // https://react-select.com/styles#overriding-the-theme
-                primary50: 'var(--theia-accent-color4)',
+                primary50: 'var(--theia-arduino-selectItemHoverBackground)',
             }
         });
         const DropdownIndicator = () => <span className='fa fa-caret-down caret' />;
diff --git a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx
index 124b9474..50a6baaf 100644
--- a/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx
+++ b/arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx
@@ -68,6 +68,7 @@ export class ListItemRenderer<T extends ArduinoComponent> {
                 return <label>{availableVersions[0]}</label>
             } else {
                 return <select
+                    className='theia-select'
                     value={input.selectedVersion}
                     onChange={onSelectChange}>
                     {
diff --git a/arduino-ide-extension/src/browser/components/component-list/search-bar.tsx b/arduino-ide-extension/src/browser/components/component-list/search-bar.tsx
index 783ac369..52953d07 100644
--- a/arduino-ide-extension/src/browser/components/component-list/search-bar.tsx
+++ b/arduino-ide-extension/src/browser/components/component-list/search-bar.tsx
@@ -10,7 +10,7 @@ export class SearchBar extends React.Component<SearchBar.Props> {
     render(): React.ReactNode {
         return <input
                 ref={this.setRef}
-                className={SearchBar.Styles.SEARCH_BAR_CLASS}
+                className={`theia-input ${SearchBar.Styles.SEARCH_BAR_CLASS}`}
                 type='text'
                 placeholder='Filter your search...'
                 size={1}
diff --git a/arduino-ide-extension/src/browser/data/arduino.color-theme.json b/arduino-ide-extension/src/browser/data/arduino.color-theme.json
index 2c34fff0..87e28467 100644
--- a/arduino-ide-extension/src/browser/data/arduino.color-theme.json
+++ b/arduino-ide-extension/src/browser/data/arduino.color-theme.json
@@ -85,7 +85,42 @@
 		"editor.foreground": "#434f54",
 		"editorWhitespace.foreground": "#BFBFBF",
 		"editor.lineHighlightBackground": "#434f5410",
-		"editor.selectionBackground": "#ffcb00"
+		"editor.selectionBackground": "#ffcb00",
+    "focusBorder": "#4db7bb99",
+    "menubar.selectionBackground": "#ffffff",
+    "menubar.selectionForeground": "#212121",
+    "menu.selectionBackground": "#dae3e3",
+    "menu.selectionForeground": "#212121",
+    "editorGroupHeader.tabsBackground": "#f7f9f9",
+    "button.background": "#4db7bb",
+    "titleBar.activeBackground": "#006468",
+    "titleBar.activeForeground": "#ffffff",
+    "secondaryButton.background": "#b5c8c9",
+    "secondaryButton.hoverBackground": "#dae3e3",
+    "terminal.background": "#000000",
+    "terminal.foreground": "#e0e0e0",
+    "dropdown.border": "#ececec",
+    "dropdown.background": "#ececec",
+    "warningForeground": "#434f54",
+    "activityBar.background": "#ececec",
+    "activityBar.foreground": "#616161",
+    "statusBar.background": "#006468",
+    "arduino.base": "#006468",
+    "arduino.dialogTitle": "#00979d",
+    "arduino.select": "#ececec",
+    "arduino.selectItemHoverBackground": "#4db7bb66",
+    "list.hoverBackground": "#ececec",
+    "arduino.secondaryButtonShadow": "#95a5a6",
+    "arduino.buttonShadow": "#006468",
+    "arduino.boardSelectorCheck": "#4db7bb",
+    "arduino.listItemInstalledBadge": "#4db7bb",
+    "inputValidation.warningBackground": "#ffb300",
+    "arduino.listItemInfoLinkForeground": "#17a1a5",
+    "arduino.toolbarItemForeground": "#006468",
+    "arduino.toolbarTooltip": "#e0e0e0",
+    "arduino.bottomPanelTabBackground": "#ffffff",
+    "arduino.toolbarToggleBackground": "#b5c8c9"
 	},
+  "type": "light",
 	"name": "Arduino"
 }
\ No newline at end of file
diff --git a/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx b/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx
index 65a009f6..42f454f3 100644
--- a/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx
+++ b/arduino-ide-extension/src/browser/monitor/monitor-widget.tsx
@@ -209,7 +209,7 @@ export class SerialMonitorSendInput extends React.Component<SerialMonitorSendInp
         return <input
             ref={this.setRef}
             type='text'
-            className={this.props.monitorConfig ? '' : 'warning'}
+            className={`theia-input ${this.props.monitorConfig ? '' : 'warning'}`}
             placeholder={this.placeholder}
             value={this.state.text}
             onChange={this.onChange}
diff --git a/arduino-ide-extension/src/browser/style/arduino-select.css b/arduino-ide-extension/src/browser/style/arduino-select.css
index efcac088..85b2fedb 100644
--- a/arduino-ide-extension/src/browser/style/arduino-select.css
+++ b/arduino-ide-extension/src/browser/style/arduino-select.css
@@ -1,10 +1,10 @@
 .arduino-select__control {
-    border: var(--theia-layout-color2) var(--theia-border-width) solid !important;
-    background: var(--theia-layout-color2) !important;
+    border: var(--theia-arduino-select) var(--theia-border-width) solid !important;
+    background: var(--theia-arduino-select) !important;
 }
 
 .arduino-select__control:hover {
-    border: var(--theia-layout-color2) var(--theia-border-width) solid !important;
+    border: var(--theia-arduino-select) var(--theia-border-width) solid !important;
 }
 
 .arduino-select__control--is-focused {
@@ -12,31 +12,31 @@
 }
 
 .arduino-select__option--is-selected {
-    background-color: var(--theia-accent-color3) !important;
-    color: var(--theia-content-font-color0) !important;
-    border-color: var(--theia-accent-color3) !important;
+    background-color: var(--theia-focusBorder) !important;
+    color: var(--theia-editor-foreground) !important;
+    border-color: var(--theia-focusBorder) !important;
 }
 
 .arduino-select__option--is-focused {
-    background-color: var(--theia-accent-color4) !important;
-    border-color: var(--theia-accent-color3) !important;
+    background-color: var(--theia-arduino-selectItemHoverBackground) !important;
+    border-color: var(--theia-focusBorder) !important;
 }
 
 .arduino-select__menu {
-    background-color: var(--theia-layout-color2) !important;
-    border: 1px solid var(--theia-accent-color3) !important;
+    background-color: var(--theia-arduino-select) !important;
+    border: 1px solid var(--theia-focusBorder) !important;
     top: auto !important; /* to align the top of the menu with the bottom of the control */
     box-shadow: none !important;
 }
 
 .arduino-select__control.arduino-select__control--menu-is-open {
     border: 1px solid !important;
-    border-color: var(--theia-accent-color3) !important;
-    border-bottom-color: var(--theia-layout-color2) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */
+    border-color: var(--theia-focusBorder) !important;
+    border-bottom-color: var(--theia-arduino-select) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */
 }
 
 .arduino-select__value-container .arduino-select__single-value {
-    color: var(--theia-ui-font-color1) !important;
+    color: var(--theia-descriptionForeground) !important;
 }
 
 .arduino-select__menu-list {
diff --git a/arduino-ide-extension/src/browser/style/arduino.useable.css b/arduino-ide-extension/src/browser/style/arduino.useable.css
deleted file mode 100644
index 63485e8f..00000000
--- a/arduino-ide-extension/src/browser/style/arduino.useable.css
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-The following CSS variables define the main public API for styling Theia.
-These variables should be used by all extensions wherever possible. In other
-words, extensions should not define custom colors, sizes, etc. unless
-absolutely necessary. This enables users to adapt the visual theme of Theia
-by changing these variables.
-
-Many variables appear in ordered sequences (0,1,2,...). For most of these
-sequences, colors go from dark to bright for dark themes, and from bright to
-dark for bright themes. A few sequences are used to create contrast against
-the others, e.g. font and accent colors, and thus their brightness goes the
-other way around.
-
-Throughout Theia, we are mostly following principles from Google's Material
-Design when selecting colors. We are not, however, following all of MD as it
-is not optimized for dense, information rich UIs.
-*/
-
-:root {
-    /* Custom Theme Colors */
-    --theia-arduino-light: rgb(0, 100, 104);
-    --theia-arduino-light1: rgb(23, 161, 165);
-    --theia-arduino-light2: rgb(218, 226, 228);
-    --theia-arduino-light3: rgb(237, 241, 242);
-    --theia-arduino-terminal: rgb(0, 0, 0);
-
-    /* Borders: Width and color (bright to dark) */
-    
-    --theia-border-width: 1px;
-    --theia-panel-border-width: 2px;
-    --theia-border-color0: var(--md-grey-100);
-    --theia-border-color1: var(--md-grey-200);
-    --theia-border-color2: var(--md-grey-300);
-    --theia-border-color3: var(--md-grey-400);
-    
-    
-    /* UI fonts: Family, size and color (dark to bright)
-        ---------------------------------------------------
-         The UI font CSS variables are used for the typography all of the Theia
-         user interface elements that are not directly user-generated content.
-      */
-
-    --theia-ui-font-scale-factor: 1.2;
-    --theia-ui-font-size0: calc(var(--theia-ui-font-size1) / var(--theia-ui-font-scale-factor));
-    --theia-ui-font-size1: 13px; /* Base font size */
-    --theia-ui-font-size2: calc(var(--theia-ui-font-size1) * var(--theia-ui-font-scale-factor));
-    --theia-ui-font-size3: calc(var(--theia-ui-font-size2) * var(--theia-ui-font-scale-factor));
-    --theia-ui-icon-font-size: 14px; /* Ensures px perfect FontAwesome icons */
-    --theia-ui-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-    --theia-ui-font-color0: var(--md-grey-900);
-    --theia-ui-font-color1: var(--md-grey-700);
-    --theia-ui-font-color2: var(--md-grey-500);
-    --theia-ui-font-color3: var(--md-grey-300);
-    
-    /* Special font colors */
-    
-    --theia-ui-icon-font-color: #ffffff;
-    --theia-ui-bar-font-color0: var(--theia-ui-font-color0);
-    --theia-ui-bar-font-color1: var(--theia-inverse-ui-font-color0); /* var(--theia-ui-font-color1); */
-    
-    /* Use the inverse UI colors against the brand/accent/warn/error colors. */
-    
-    --theia-inverse-ui-font-color0: rgba(255, 255, 255, 1.0);
-    --theia-inverse-ui-font-color2: rgba(255, 255, 255, 0.7);
-    --theia-inverse-ui-font-color3: rgba(255, 255, 255, 0.5);
-    
-    /* Content fonts: Family, size and color (dark to bright)
-         Content font variables are used for typography of user-generated content.
-      */
-    
-    --theia-content-font-size: 13px;
-    --theia-content-line-height: 1.5;
-    --theia-content-font-color0: black;
-    --theia-content-font-color1: black;
-    --theia-content-font-color2: var(--md-grey-700);
-    --theia-content-font-color3: var(--md-grey-500);
-    --theia-code-font-size: 13px;
-    --theia-code-line-height: 17px;
-    --theia-code-padding: 5px;
-    --theia-code-font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
-    --theia-terminal-font-family: monospace;
-    --theia-ui-padding: 6px;
-
-    /* Tab Icon Colors */
-    --theia-tab-icon-color: var(--theia-ui-font-color1);
-    --theia-tab-font-color: #000;
-    
-    /* Main layout colors (bright to dark)
-      ------------------------------------ */
-    
-    --theia-layout-color0: #ffffff;
-    --theia-layout-color1: #f7f9f9;
-    --theia-layout-color2: #ececec;
-    --theia-layout-color3: var(--theia-arduino-light2);
-    --theia-layout-color4: #dcdcdc;
-
-    /* Brand colors */
-    
-    --theia-brand-color0: var(--theia-arduino-light);
-    --theia-brand-color1: var(--theia-arduino-light1);
-    --theia-brand-color2: var(--theia-arduino-light2);
-    --theia-brand-color3: var(--theia-arduino-light3);
-    
-    /* Secondary Brand colors */
-    
-    --theia-secondary-brand-color0: var(--md-grey-700);
-    --theia-secondary-brand-color1: #b5c8c9;
-    --theia-secondary-brand-color2: var(--theia-arduino-light2);
-    --theia-secondary-brand-color3: var(--theia-arduino-light3);
-    
-    /* Accent colors (dark to bright): Use these to create contrast to layout colors. */
-    
-    --theia-accent-color0: var(--theia-arduino-light);
-    --theia-accent-color1: rgb(77, 183, 187, 1.0);
-    --theia-accent-color2: rgb(77, 183, 187, 0.8);
-    --theia-accent-color3: rgb(77, 183, 187, 0.6);
-    --theia-accent-color4: rgba(77, 183, 187, 0.4);
-    
-    /* Accent colors with opacity */
-    
-    --theia-transparent-accent-color0: hsla(210, 63%, 46%, 0.3);
-    --theia-transparent-accent-color1: hsla(207, 66%, 56%, 0.3);
-    --theia-transparent-accent-color2: hsla(207, 64%, 85%, 0.3);
-    --theia-transparent-accent-color3: hsla(205, 70%, 91%, 0.3);
-    
-    /* State colors (warn, error, success, info)
-        ------------------------------------------ */
-    --theia-warn-color0: var(--md-amber-500);
-    --theia-warn-color1: var(--md-amber-400);
-    --theia-warn-color2: var(--md-amber-300);
-    --theia-warn-color3: var(--md-amber-200);
-
-    --theia-warn-font-color0: var(--md-grey-900);
-    
-    --theia-error-color0: var(--md-red-400);
-    --theia-error-color1: #da5b4a;
-    --theia-error-color2: var(--md-red-200);
-    --theia-error-color3: var(--md-red-100);
-    
-    --theia-error-font-color0: var(--md-grey-300);
-    
-    --theia-success-color0: var(--md-green-500);
-    --theia-success-color1: var(--md-green-300);
-    --theia-success-color2: var(--md-green-100);
-    --theia-success-color3: var(--md-green-50);
-    
-    --theia-success-font-color0: var(--md-grey-300);
-    
-    --theia-info-color0: var(--md-cyan-700);
-    --theia-info-color1: var(--md-cyan-500);
-    --theia-info-color2: var(--md-cyan-300);
-    --theia-info-color3: var(--md-cyan-100);
-    
-    --theia-info-font-color0: var(--md-grey-300);
-    
-    --theia-disabled-color0: var(--md-grey-500);
-    --theia-disabled-color1: var(--md-grey-300);
-    --theia-disabled-color2: var(--md-grey-200);
-    --theia-disabled-color3: var(--md-grey-50);
-    
-    --theia-added-color0: rgba(0, 255, 0, 0.8);
-    --theia-removed-color0: rgba(230, 0, 0, 0.8);
-    --theia-modified-color0: rgba(0, 100, 150, 0.8);
-    
-    /* Background for selected text */
-    --theia-selected-text-background: var(--theia-accent-color3);
-    
-    /* Colors to highlight words in widgets like tree or editors */
-    
-    --theia-word-highlight-color0: rgba(168, 172, 148, 0.7);
-    --theia-word-highlight-color1: rgba(253, 255, 0, 0.2);
-    --theia-word-highlight-match-color0: rgba(234, 92, 0, 0.33);
-    --theia-word-highlight-match-color1: rgba(234, 92, 0, 0.5);
-    --theia-word-highlight-replace-color0: rgba(155, 185, 85, 0.2);
-    
-    /* Scroll-bars */
-    
-    --theia-scrollbar-width: 10px;
-    --theia-scrollbar-rail-width: 10px;
-    --theia-scrollbar-thumb-color: hsla(0, 0%, 61%, .4);
-    --theia-scrollbar-rail-color: transparent;
-    --theia-scrollbar-active-thumb-color: hsla(0, 0%, 39%, .4);
-    --theia-scrollbar-active-rail-color: transparent;
-    /* Menu */
-    --theia-menu-color0: var(--theia-arduino-light);
-    --theia-menu-color1: var(--theia-layout-color0);
-    --theia-menu-color2: #dae3e3;
-    /* Statusbar */
-    --theia-statusbar-color: var(--theia-arduino-light);
-    --theia-statusBar-font-color: var(--theia-inverse-ui-font-color0);
-    --theia-statusBar-font-size: 12px;
-    /* Buttons */
-    --theia-ui-button-color: var(--theia-accent-color1);
-    --theia-ui-button-color-hover: var(--theia-accent-color2);
-    --theia-ui-button-font-color: var(--theia-arduino-light);
-    --theia-ui-button-color-secondary: var(--theia-secondary-brand-color1);
-    --theia-ui-button-color-secondary-hover: var(--theia-menu-color2);
-    --theia-ui-button-font-color-secondary: var(--theia-inverse-ui-font-color0);
-    --theia-ui-button-color-disabled: var(--theia-accent-color3);
-    --theia-ui-button-font-color-disabled: var(--theia-ui-font-color2);
-    --theia-ui-button-color-secondary-disabled: var(--theia-disabled-color1);
-    --theia-ui-button-font-color-secondary-disabled: var(--theia-ui-font-color2);
-    /* Expand/collapse element */
-    --theia-ui-expand-button-color: var(--theia-accent-color4);
-    --theia-ui-expand-button-font-color: var(--theia-ui-font-color1);
-    /* Dialogs */
-    --theia-ui-dialog-header-color: var(--theia-arduino-light);
-    --theia-ui-dialog-header-font-color: var(--theia-inverse-ui-font-color0);
-    --theia-ui-dialog-color: rgb(236, 241, 241);
-    --theia-ui-dialog-font-color: black;
-    /* Variables */
-    --theia-variable-name-color: #9B46B0;
-    --theia-variable-value-color: rgba(108, 108, 108, 0.8);
-    --theia-number-variable-color: #09885A;
-    --theia-boolean-variable-color: #0000FF;
-    --theia-string-variable-color: #A31515;
-    /* ANSI color */
-    --theia-ansi-black-color: gray;
-    --theia-ansi-red-color: #BE1717;
-    --theia-ansi-green-color: #338A2F;
-    --theia-ansi-yellow-color: #BEB817;
-    --theia-ansi-blue-color: darkblue;
-    --theia-ansi-magenta-color: darkmagenta;
-    --theia-ansi-cyan-color: darkcyan;
-    --theia-ansi-white-color: #BDBDBD;
-    /* ANSI background color */
-    --theia-ansi-black-background-color: gray;
-    --theia-ansi-red-background-color: #BE1717;
-    --theia-ansi-green-background-color: #338A2F;
-    --theia-ansi-yellow-background-color: #BEB817;
-    --theia-ansi-blue-background-color: darkblue;
-    --theia-ansi-magenta-background-color: darkmagenta;
-    --theia-ansi-cyan-background-color: darkcyan;
-    --theia-ansi-white-background-color: #BDBDBD;
-
-    /* Output */
-    --theia-output-font-color: var(--theia-ui-font-color3);
-
-  }
\ No newline at end of file
diff --git a/arduino-ide-extension/src/browser/style/board-select-dialog.css b/arduino-ide-extension/src/browser/style/board-select-dialog.css
index 3594412c..60c24157 100644
--- a/arduino-ide-extension/src/browser/style/board-select-dialog.css
+++ b/arduino-ide-extension/src/browser/style/board-select-dialog.css
@@ -15,7 +15,7 @@ div.dialogContent.select-board-dialog > div.head .title {
     font-weight: 400;
     letter-spacing: .02em;
     font-size: 1.2em;
-    color: #00979d;
+    color: var(--theia-arduino-dialogTitle);
     margin: 17px 0;
 }
 
@@ -24,18 +24,18 @@ div#select-board-dialog .selectBoardContainer .head .text {
 }
 
 div#select-board-dialog .selectBoardContainer .body .list .item.selected {
-    background: var(--theia-ui-button-color-secondary-hover);
+    background: var(--theia-secondaryButton-hoverBackground);
 }
 
 div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
-    color: var(--theia-arduino-light);
+    color: var(--theia-arduino-base);
 }
 
 #select-board-dialog .selectBoardContainer .search,
 #select-board-dialog .selectBoardContainer .search input,
 #select-board-dialog .selectBoardContainer .list,
 #select-board-dialog .selectBoardContainer .list {
-    background: var(--theia-layout-color0);
+    background: var(--theia-editor-background);
 }
 
 #select-board-dialog .selectBoardContainer .body .search input {
@@ -47,7 +47,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
     margin: 0;
     vertical-align: top;
     display: flex;
-    color: var(--theia-content-font-color0);
+    color: var(--theia-editor-foreground);
 }
 
 #select-board-dialog .selectBoardContainer .body .search input:focus {
@@ -79,7 +79,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
 
 #select-board-dialog .selectBoardContainer .body .container .content .loading {
     font-size: var(--theia-ui-font-size1);
-    color: #7f8c8d;
+    color: var(--theia-arduino-dialogSecondaryTitle);
     padding: 10px 5px 10px 10px;
     text-transform: uppercase;
     /* The max, min-height comes from `.body .list` 265px + 47px top padding - 2 * 10px top padding */
@@ -99,7 +99,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
 
 #select-board-dialog .selectBoardContainer .body .list .item .detail {
     font-size: var(--theia-ui-font-size1);
-    color: var(--theia-disabled-color0);
+    color: var(--theia-mod-disabled-opacity);
     width: 155px; /* used heuristics for the calculation */
     white-space: pre;
     overflow: hidden;
@@ -107,11 +107,11 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
 }
 
 #select-board-dialog .selectBoardContainer .body .list .item.missing {
-    color: var(--theia-disabled-color0);
+    color: var(--theia-mod-disabled-opacity);
 }
 
 #select-board-dialog .selectBoardContainer .body .list .item:hover {
-    background: var(--theia-ui-button-color-secondary-hover);
+    background: var(--theia-secondaryButton-hoverBackground);
 }
 
 #select-board-dialog .selectBoardContainer .body .list {
@@ -140,15 +140,14 @@ button.theia-button {
 }
 
 button.theia-button.secondary {
-    background-color: #b5c8c9;
-    color: #000;
-    box-shadow: 0 4px #95a5a6;
+    background-color: var(--theia-secondaryButton-background);
+    color: var(--theia-foreground);
+    box-shadow: 0 4px var(--theia-arduino-secondaryButtonShadow);
 }
 
 button.theia-button.main {
-    color: #fff;
-    /* background-color: #00979c; */
-    box-shadow: 0 4px var(--theia-accent-color0);
+    color: var(--theia-button-foreground);
+    box-shadow: 0 4px var(--theia-arduino-buttonShadow);
 }
 
 .dialogControl {
@@ -192,7 +191,8 @@ button.theia-button.main {
 }
 
 .arduino-boards-toolbar-item {
-    background: var(--theia-layout-color1);
+    background: var(--theia-arduino-boardSelectorBackground);
+    color: var(--theia-foreground);
     height: 22px;
     display: flex;
     width: 100%;
@@ -200,7 +200,7 @@ button.theia-button.main {
 }
 
 .arduino-boards-dropdown-list {
-    border: 3px solid var(--theia-border-color2);
+    border: 3px solid var(--theia-arduino-boardSelectorBorder);
     margin: -3px;
     z-index: 1;
 }
@@ -210,16 +210,16 @@ button.theia-button.main {
     display: flex;
     padding: 10px;
     cursor: pointer;
-    color: var(--theia-ui-font-color1);
-    background: var(--theia-layout-color1);
+    color: var(--theia-foreground);
+    background: var(--theia-arduino-boardSelectorBackground);
 }
 
 .arduino-boards-dropdown-item .fa-check {
-    color: var(--theia-accent-color1);
+    color: var(--theia-arduino-boardSelectorCheck);
     align-self: center;
 }
 
 .arduino-boards-dropdown-item.selected,
 .arduino-boards-dropdown-item:hover {
-    background: var(--theia-layout-color3);
+    background: var(--theia-arduino-boardSelectorHoverBackground);
 }
diff --git a/arduino-ide-extension/src/browser/style/browser-menu.css b/arduino-ide-extension/src/browser/style/browser-menu.css
index eed004c9..b5ecc530 100644
--- a/arduino-ide-extension/src/browser/style/browser-menu.css
+++ b/arduino-ide-extension/src/browser/style/browser-menu.css
@@ -11,5 +11,5 @@
 }
 
 .p-MenuBar-item.p-mod-active {
-    color: var(--theia-ui-bar-font-color0);
+    color: var(--theia-menubar-selectionForeground);
 }
\ No newline at end of file
diff --git a/arduino-ide-extension/src/browser/style/index.css b/arduino-ide-extension/src/browser/style/index.css
index 4f76caeb..e8690b51 100644
--- a/arduino-ide-extension/src/browser/style/index.css
+++ b/arduino-ide-extension/src/browser/style/index.css
@@ -5,39 +5,31 @@
 @import './monitor.css';
 @import './arduino-select.css';
 
-input:focus {
+.theia-input.warning:focus {
     outline-width: 1px;
     outline-style: solid;
     outline-offset: -1px;
     opacity: 1 !important;
-    outline-color: var(--theia-accent-color3);
+    color: var(--theia-foreground);
+    background-color: var(--theia-inputValidation-warningBackground);
 }
 
-input.warning:focus {
-    outline-width: 1px;
-    outline-style: solid;
-    outline-offset: -1px;
-    opacity: 1 !important;
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning {
+    background-color: var(--theia-inputValidation-warningBackground);
 }
 
-input.warning {
-    background-color: var(--theia-warn-color0);
-}
-
-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: var(--theia-foreground);
+    background-color: var(--theia-inputValidation-warningBackground);
     opacity: 1; /* Firefox */
 }
 
-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: var(--theia-foreground);
+    background-color: var(--theia-inputValidation-warningBackground);
 }
 
-input.warning::-ms-input-placeholder { /* Microsoft Edge */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning::-ms-input-placeholder { /* Microsoft Edge */
+    color: var(--theia-foreground);
+    background-color: var(--theia-inputValidation-warningBackground);
 }
diff --git a/arduino-ide-extension/src/browser/style/list-widget.css b/arduino-ide-extension/src/browser/style/list-widget.css
index 1a887171..4f85aeb8 100644
--- a/arduino-ide-extension/src/browser/style/list-widget.css
+++ b/arduino-ide-extension/src/browser/style/list-widget.css
@@ -4,36 +4,15 @@
 }
 
 .arduino-list-widget {
-    color: var(--theia-ui-font-color1);
+    color: var(--theia-foreground);
 }
 
 .arduino-list-widget .search-bar {
     margin: 0px 10px 10px 15px;
 }
 
-.arduino-list-widget .search-filters {
-    margin: 0px 10px 0px 15px;
-    border-color: var(--theia-border-color3);
-}
-
 .arduino-list-widget .search-bar:focus {
-    border-color: var(--theia-accent-color3);
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter {
-    margin: 0px 0px 10px 0px;
-    display: flex;
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter .title {
-    margin: 0px 10px 0px 0px;
-    align-self: center;
-    text-transform: uppercase;
-    font-size: var(--theia-ui-font-size0);
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter > select {
-    width: 100%;
+    border-color: var(--theia-focusBorder);
 }
 
 .filterable-list-container {
@@ -49,15 +28,15 @@
 }
 
 .filterable-list-container .items-container > div:nth-child(odd) {
-    background-color: var(--theia-layout-color0);
+    background-color: var(--theia-arduino-listOddItem);
 }
 
 .filterable-list-container .items-container > div:nth-child(even) {
-    background-color: var(--theia-layout-color1);
+    background-color: var(--theia-arduino-listEvenItem);
 }
 
 .filterable-list-container .items-container > div:hover {
-    background-color: var(--theia-layout-color2);
+    background-color: var(--theia-arduino-listItemHoverBackground);
 }
 
 /* Perfect scrollbar does not like if we explicitly set the `background-color` of the contained elements.
@@ -74,18 +53,9 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 }
 
 .component-list-item:hover {
-    background: var(--theia-accent-color4);
     cursor: pointer;
 }
 
-.component-list-item:hover .meta-info {
-    color: var(--theia-ui-font-color1);
-}
-
-.component-list-item .meta-info {
-    color: var(--theia-ui-font-color3);
-}
-
 .component-list-item .header {
     padding-bottom: 2px;
     display: flex;
@@ -104,33 +74,33 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 
 .component-list-item .header .author {
     font-weight: bold;
-    color: var(--theia-ui-font-color2);
+    color: var(--theia-arduino-listItemSecondaryForeground);
 }
 
 .component-list-item:hover .header .author {
-    color: var(--theia-ui-font-color1);
+    color: var(--theia-foreground);
 }
 
 .component-list-item .header .version {
-    color: var(--theia-ui-font-color2);
+    color: var(--theia-arduino-listItemSecondaryForeground);
 }
 
 .component-list-item .header .installed:before {
     margin-left: 4px;
     display: inline-block;
     justify-self: end;
-    background-color: var(--theia-accent-color1);
+    background-color: var(--theia-arduino-listItemInstalledBadge);
     padding: 2px 4px 2px 4px;
     font-size: 10px;
     font-weight: bold;
     max-height: calc(1em + 4px);
-    color: var(--theia-inverse-ui-font-color0);
+    color: var(--theia-button-foreground);
     content: 'INSTALLED';
 }
 
 .component-list-item .header .installed:hover:before {
-    background-color: var(--theia-inverse-ui-font-color0);
-    color: var(--theia-accent-color1);
+    background-color: var(--theia-button-foreground);
+    color: var(--theia-arduino-listItemInstalledBadge);
     content: 'UNINSTALL';
 }
 
@@ -161,14 +131,10 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 }
 
 .component-list-item .info a {
-    color: var(--theia-brand-color1);
+    color: var(--theia-arduino-listItemInfoLinkForeground);
     text-decoration: none;
 }
 
 .component-list-item a:hover {
     text-decoration: underline;
 }
-
-.component-list-item strong.installed {
-    color: rgb(0, 151, 157)
-}
diff --git a/arduino-ide-extension/src/browser/style/main.css b/arduino-ide-extension/src/browser/style/main.css
index 00628233..a99fdbff 100644
--- a/arduino-ide-extension/src/browser/style/main.css
+++ b/arduino-ide-extension/src/browser/style/main.css
@@ -1,9 +1,14 @@
-.p-TabBar[data-orientation='horizontal'].theia-app-bottom {
-    background: var(--theia-layout-color1);
+#theia-bottom-content-panel .p-TabBar[data-orientation='horizontal'].theia-app-bottom {
+    background: var(--theia-editorGroupHeader-tabsBackground);
+}
+
+#theia-bottom-content-panel .p-TabBar-tab {
+    background: var(--theia-arduino-bottomPanelTabBackground);
 }
 
 .theia-output {
-    background: var(--theia-arduino-terminal);
+    background: var(--theia-terminal-background);
+    color: var(--theia-terminal-foreground);
 }
 
 #outputView {
@@ -20,11 +25,11 @@
     align-items: center;
     height: 24px;
     width: 24px;
-    background: var(--theia-ui-button-color);
+    background: var(--theia-button-background);
 }
 
 .p-TabBar-toolbar .item.arduino-tool-item > div:hover {
-    background: var(--theia-ui-button-color-hover);
+    background: var(--theia-button-hoverBackground);
 }
 
 .arduino-verify, .arduino-upload {
@@ -34,7 +39,8 @@
 .arduino-tool-icon {
     height: 24px;
     width: 24px;
-    background: var(--theia-ui-button-font-color);
+    color: var(--theia-arduino-toolbarItemForeground);
+    background: var(--theia-arduino-toolbarItemForeground);
     -webkit-mask: url(../icons/mask-buttons.svg);
     mask: url(../icons/mask-buttons.svg);
     -webkit-mask-size: 800%;
@@ -86,29 +92,11 @@
     justify-content: flex-end;
 }
 
-.arduino-tool-item.item.connected-boards {
-    opacity: 1;
-}
-
-.arduino-tool-item.item.connected-boards select {
-    line-height: var(--theia-content-line-height);
-    font-size: var(--theia-ui-font-size1);
-    color: var(--theia-ui-font-color1);
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    background-image: linear-gradient(45deg, transparent 50%, var(--theia-ui-font-color1) 50%), linear-gradient(135deg, var(--theia-ui-font-color1) 50%, transparent 50%);
-    background-position: calc(100% - 6px) 8px, calc(100% - 2px) 8px, 100% 0;
-    background-size: 4px 5px;
-    background-repeat: no-repeat;
-    padding-left: 3px;
-    padding-right: 15px;
-}
-
 .arduino-toolbar-tooltip {
     margin-left: 10px;
     display: flex;
     align-items: center;
-    color: var(--theia-ui-font-color3);
+    color: var(--theia-arduino-toolbarTooltip);
 }
 
 .p-TabBar-toolbar .item > div.arduino-toggle-advanced-mode {
@@ -126,11 +114,11 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    color: var(--theia-ui-button-font-color);
+    color: var(--theia-arduino-toolbarItemForeground);
 }
 
 .monaco-editor .margin {
-    border-right: 2px solid var(--theia-border-color1);
+    border-right: 2px solid var(--theia-arduino-editorMargin);
     box-sizing: border-box;
 }
 
diff --git a/arduino-ide-extension/src/browser/style/monitor.css b/arduino-ide-extension/src/browser/style/monitor.css
index f3bc3674..fcb73978 100644
--- a/arduino-ide-extension/src/browser/style/monitor.css
+++ b/arduino-ide-extension/src/browser/style/monitor.css
@@ -14,7 +14,6 @@
 .serial-monitor .head {
     display: flex;
     padding: 5px;
-    background: var(--theia-layout-color0);
     height: 27px;
 }
 
@@ -30,7 +29,7 @@
 }
 
 .serial-monitor .head .send > input:focus {
-    border-color: var(--theia-accent-color3);
+    border-color: var(--theia-focusBorder);
 }
 
 .serial-monitor .head .config {
@@ -55,7 +54,7 @@
 }
 
 .p-TabBar-toolbar .item.arduino-monitor.toggled {
-    background: var(--theia-secondary-brand-color1);
+    background: var(--theia-arduino-toolbarToggleBackground);
 }
 
 .p-TabBar-toolbar .item .clear-all {
diff --git a/yarn.lock b/yarn.lock
index e9b397db..70849190 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1687,16 +1687,16 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@theia/application-manager@0.14.0-next.0159cd5b":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.14.0-next.0159cd5b.tgz#4e57bd5eda4d2710332d1a77151767dec9a8693a"
-  integrity sha512-KgxMZxQZR/LtId6hQFJXpQ5aVDKfYy0+eX1GG4ClJI9pIHoIa3Kllfl3EEN2lsSeFRQq+UtSdSUbvNQqvUv6Pg==
+"@theia/application-manager@0.15.0-next.183ba3e5":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-0.15.0-next.183ba3e5.tgz#6ee416d7dfa8fe3309dc0b47402ff7efd99a1cda"
+  integrity sha512-8MjrYnVXtCTbna8W/mcXdgOlQJjHMZXC9Cxu0oL5DWHwZhE/qgdz9uousiBGrdSJ8DT+WQ/I+SgTkS6cFuhUPQ==
   dependencies:
     "@babel/core" "^7.5.5"
     "@babel/plugin-transform-classes" "^7.5.5"
     "@babel/plugin-transform-runtime" "^7.5.5"
     "@babel/preset-env" "^7.5.5"
-    "@theia/application-package" "0.14.0-next.0159cd5b"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
     "@theia/compression-webpack-plugin" "^3.0.0"
     "@types/fs-extra" "^4.0.2"
     babel-loader "^8.0.6"
@@ -1718,10 +1718,10 @@
     webpack-cli "2.0.12"
     worker-loader "^1.1.1"
 
-"@theia/application-package@0.14.0-next.0159cd5b", "@theia/application-package@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.14.0-next.0159cd5b.tgz#888061bfaea245462b50b512829efcd5f2ae32ee"
-  integrity sha512-ck0ttkgSJFzRfEZEhOC0FUh8aBz7SRFOEKw4yLgwO+RIFJLGJup5F//W2NFsBas8eHR9Ky/bcSYdxi0emEdaQg==
+"@theia/application-package@0.15.0-next.183ba3e5", "@theia/application-package@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-0.15.0-next.183ba3e5.tgz#50e66311c9447abe1eea52fb5e1110780d35fe6b"
+  integrity sha512-/XmOt/ZG8BcxjMfreV9trTJFaKI/iezhzRLRLvw3J8anT3cxqiktE+jeDtYpQ1fbpElQZiLUz8RKLl+xqDVY+g==
   dependencies:
     "@types/fs-extra" "^4.0.2"
     "@types/request" "^2.0.3"
@@ -1735,12 +1735,12 @@
     write-json-file "^2.2.0"
 
 "@theia/cli@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.14.0-next.0159cd5b.tgz#84ad3d65f7db7a004daabf954bba3164cc399138"
-  integrity sha512-bLdRHYqK0WxMGf+SoUQkima1fnmY1obb2dYgo5cvSLOK4mXik1oOik4ZSLv+11oKDi3qJeT6D6hEFDLkD9KadA==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-0.15.0-next.183ba3e5.tgz#a8d495c73861f4e893efcdbaf585faf23ff27685"
+  integrity sha512-xX/jGib2eO/+uLEwQYLKFkwr5RRzTl7g9ZjCgqGz/Yw4pKsnWJ0jP25Xrni5x2f5dqXtyB8415YWCa/cH8b4ng==
   dependencies:
-    "@theia/application-manager" "0.14.0-next.0159cd5b"
-    "@theia/application-package" "0.14.0-next.0159cd5b"
+    "@theia/application-manager" "0.15.0-next.183ba3e5"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
     yargs "^11.1.0"
 
 "@theia/compression-webpack-plugin@^3.0.0":
@@ -1755,15 +1755,15 @@
     serialize-javascript "^1.4.0"
     webpack-sources "^1.0.1"
 
-"@theia/core@0.14.0-next.0159cd5b", "@theia/core@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.14.0-next.0159cd5b.tgz#06f8080680d9195c8a1d148dbaa2d2396e4ff503"
-  integrity sha512-GZS++3J3TmP0xdb57CvSj/ryVaXeAaZsrQaEGR9w8tNoDk8Aq+bfSi72mqLBesnH5HuqHkniDLtxoox+spF+zg==
+"@theia/core@0.15.0-next.183ba3e5", "@theia/core@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/core/-/core-0.15.0-next.183ba3e5.tgz#b65552acf3d1ed62e09771d9af617b4f6be09177"
+  integrity sha512-p5Tr/rgrjYN7m0CR1L4ARs/n0bZNB0ltVjyMnJ98A8WSy9DYEZrui/Iohb6kB7/AmgYg2PofUloVE7FTCCbsVQ==
   dependencies:
     "@babel/runtime" "^7.5.5"
     "@phosphor/widgets" "^1.9.3"
     "@primer/octicons-react" "^9.0.0"
-    "@theia/application-package" "0.14.0-next.0159cd5b"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
     "@types/body-parser" "^1.16.4"
     "@types/express" "^4.16.0"
     "@types/fs-extra" "^4.0.2"
@@ -1801,9 +1801,9 @@
     yargs "^11.1.0"
 
 "@theia/cpp@next":
-  version "0.14.0-next.032512b0"
-  resolved "https://registry.yarnpkg.com/@theia/cpp/-/cpp-0.14.0-next.032512b0.tgz#c2a376896862ab860b3801ed931263a773edac49"
-  integrity sha512-eCqoI7btbJsqhAUlROod8TcXTwmZj8V74VpF0ADgTdePkovixKhOOKs7zlpMiiYOB6NdER8H8OIwDJl6acDzYA==
+  version "0.15.0-next.2818a5a2"
+  resolved "https://registry.yarnpkg.com/@theia/cpp/-/cpp-0.15.0-next.2818a5a2.tgz#5cc72adc3c75ffbcb8e5712c500400ff91632631"
+  integrity sha512-mr3K+YGWOtz/nj2O2770ik0pH5oZuzd2Ya9Euk0hAyJ4Mq82TD5jcyXWLMVxvU+mZtHOxumziD2okNfbH7xWuQ==
   dependencies:
     "@theia/core" next
     "@theia/editor" next
@@ -1817,21 +1817,21 @@
     "@theia/workspace" next
     string-argv "^0.1.1"
 
-"@theia/editor@0.14.0-next.0159cd5b", "@theia/editor@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.14.0-next.0159cd5b.tgz#9ede3a38f4cf8be0eac26e9f963ec47e66b488f8"
-  integrity sha512-4GriyFNDSt4DoGPuUR3f0FnVdI+RYTtlN3R2dF4bDmaDy6FsPs40slFypW9LmiqqZ6mCOEHjFj6YVGzZ5dK4jw==
+"@theia/editor@0.15.0-next.183ba3e5", "@theia/editor@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-0.15.0-next.183ba3e5.tgz#185753c8e673318f2e7825b545055f2254332fdb"
+  integrity sha512-g0QwBFCN0PHuCw8TegQ4aQhWuY5uVFe0hjcdz26ptl/pnIG8UgcjR0DFsJDYve0OmjHv/9q94PLKj6JynvxDEw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/languages" "0.14.0-next.0159cd5b"
-    "@theia/variable-resolver" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/languages" "0.15.0-next.183ba3e5"
+    "@theia/variable-resolver" "0.15.0-next.183ba3e5"
     "@types/base64-arraybuffer" "0.1.0"
     base64-arraybuffer "^0.1.5"
 
 "@theia/electron@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.14.0-next.0159cd5b.tgz#56a48f794a71b1f95e4cd046e69fa4faa4f80902"
-  integrity sha512-+IJyeWy3lc4KZ9iA7I92fLQA9BbDN9k5KjjdA22+rCJUdPt916ejs2jPf3C5qmK0W8IBFqqA/TlKr/VLV6boqQ==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-0.15.0-next.183ba3e5.tgz#94fdcceb9d5a92fe3518b15773af7df8adee2c3d"
+  integrity sha512-ct5Nx3s4viJ+Sja2t18CuSqocO3GgpSZUg7BEF5FlHgRfO/U3gaZE2HRng3TgW2XF6ki+LsvQ2rdLaXQW10NLw==
   dependencies:
     electron "^4.2.11"
     electron-download "^4.1.1"
@@ -1843,25 +1843,25 @@
     yargs "^11.1.0"
 
 "@theia/file-search@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.14.0-next.0159cd5b.tgz#287a5d96b4d8a24f5fc7d7b080fa9c369a96cc4a"
-  integrity sha512-GwrFUXQYPOCXlVT+4DLsiNP8wUJ7uQR3Fbr2H0A+1RFTCwxYhZr09XuYw9ITqCDow7IPcky8LwnBDmmo95BcZw==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-0.15.0-next.183ba3e5.tgz#5a86464489ee0a18030b99ffb78b67950811f658"
+  integrity sha512-qJ4wfwh9pmSqOpqC91jo3DDtsaPsvwY4MYXJiLEyntPNwzoRxQyhmlCo8X2mxJYnjl/fAB4xTm0GLvg+FWx1uA==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/process" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/process" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     fuzzy "^0.1.3"
     vscode-ripgrep "^1.2.4"
 
-"@theia/filesystem@0.14.0-next.0159cd5b", "@theia/filesystem@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.14.0-next.0159cd5b.tgz#e188e978e88cd9c7ff011e428d35ce1cb18f2e2b"
-  integrity sha512-liYx841kEKtJMla1CB6S6PKrc1Phg+wfVf/NZUicOkLMtYIj2ShiI0o5QrHFwii0okZQdoL4ZQUudpHySdzfBQ==
+"@theia/filesystem@0.15.0-next.183ba3e5", "@theia/filesystem@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-0.15.0-next.183ba3e5.tgz#e3a877f8a54f32f24cdeb1cfad3f3e136b935a82"
+  integrity sha512-e+3TcEDM+HrM16kSKfTyYBDKzE/C0S94EPpLIrVTdvJx3yNk2nixkmiP+VHtrWtSKKWf5p5ONyBpSKZK3WXxNQ==
   dependencies:
-    "@theia/application-package" "0.14.0-next.0159cd5b"
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
+    "@theia/core" "0.15.0-next.183ba3e5"
     "@types/body-parser" "^1.17.0"
     "@types/rimraf" "^2.0.2"
     "@types/tar-fs" "^1.16.1"
@@ -1882,102 +1882,104 @@
     zip-dir "^1.0.2"
 
 "@theia/git@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.14.0-next.0159cd5b.tgz#6e8971e74114ccb391bb43f25ff3ef19289c66a4"
-  integrity sha512-GHOlIaZCGKuGOJWgd4/IBzlzHVe5iLZWbaHgAdoBGe/iObIA6f3qTZfNmS0UEHear798VjtjmCXGkioPFAfhlA==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/git/-/git-0.15.0-next.183ba3e5.tgz#d9ff1d5f506a1738d906d294863330e8e79745af"
+  integrity sha512-WPTWicpG7OQWkkXdf7yHNNAaB7Gk2Omg46DmDCIZSh6P3WGn3Fo12tkWPKF3aRs4rbU9WMgl9S3zmwxJ/bFG9w==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/languages" "0.14.0-next.0159cd5b"
-    "@theia/navigator" "0.14.0-next.0159cd5b"
-    "@theia/scm" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/languages" "0.15.0-next.183ba3e5"
+    "@theia/navigator" "0.15.0-next.183ba3e5"
+    "@theia/scm" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     "@types/diff" "^3.2.2"
     "@types/p-queue" "^2.3.1"
     diff "^3.4.0"
     dugite-extra "0.1.12"
     find-git-exec "^0.0.2"
-    find-git-repositories "^0.1.0"
+    find-git-repositories "^0.1.1"
     moment "^2.21.0"
     octicons "^7.1.0"
     p-queue "^2.4.2"
     ts-md5 "^1.2.2"
 
-"@theia/json@0.14.0-next.0159cd5b":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.14.0-next.0159cd5b.tgz#61efa83a4e5c54d9981fefd24d372a7b199bfd68"
-  integrity sha512-n183rU2BdwYn7zXGPLS9sYomgBJbUmQetFg4lj+oMgdGqOev1TiJa8T+WpkCA5gqVnIJLe/qEnhvsrfF7X827w==
+"@theia/json@0.15.0-next.183ba3e5":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/json/-/json-0.15.0-next.183ba3e5.tgz#e11c38bd85410b229320e43379d38250c5db1687"
+  integrity sha512-jUDn+/pkUh+hb6aE/ToL7BljoWTIOsjwNv0cPJbvU+0JXSEb4e1poZE9RU6aYo21AfQqp6vFstEzzaLqEKaTWQ==
   dependencies:
-    "@theia/application-package" "0.14.0-next.0159cd5b"
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/languages" "0.14.0-next.0159cd5b"
-    "@theia/monaco" "0.14.0-next.0159cd5b"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/languages" "0.15.0-next.183ba3e5"
+    "@theia/monaco" "0.15.0-next.183ba3e5"
     vscode-json-languageserver "^1.2.1"
 
-"@theia/languages@0.14.0-next.0159cd5b", "@theia/languages@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.14.0-next.0159cd5b.tgz#7d8d95428f0b2e8403aa294ae986585b69f01888"
-  integrity sha512-gw6LFLg6BKTzwrMu8zhtswMJ34IRyOtMZj3LBG8KpByBOgmms8c5AgLH6ZKaeqXV8N5iqugXlc20v6qEyyrDmA==
+"@theia/languages@0.15.0-next.183ba3e5", "@theia/languages@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/languages/-/languages-0.15.0-next.183ba3e5.tgz#b6a5391c44bd299bfb4a8ec1af163fdf3079e201"
+  integrity sha512-M2x1zgvHyOLQVX7CGtk6rNxVpUsNbt8JlALv8RL+EbYRn1UvEu247+cV8uGkuuGLD22H7Drbkm0SQnXNcOH9Bw==
   dependencies:
-    "@theia/application-package" "0.14.0-next.0159cd5b"
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/output" "0.14.0-next.0159cd5b"
-    "@theia/process" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/application-package" "0.15.0-next.183ba3e5"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/output" "0.15.0-next.183ba3e5"
+    "@theia/process" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     "@typefox/monaco-editor-core" "^0.18.0-next"
     "@types/uuid" "^3.4.3"
     monaco-languageclient "^0.10.2"
     uuid "^3.2.1"
 
-"@theia/markers@0.14.0-next.0159cd5b", "@theia/markers@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.14.0-next.0159cd5b.tgz#8875c5e8bf1d06744ae05c1ed89d760cf295965d"
-  integrity sha512-KuKU/1Twg25cWNMpspitWgKrkp33+3Hkq55dgI6ShlXKHQ4YGZmCqTvPdx/M+V39FGy222oo6fBXAmB6x8zD4w==
+"@theia/markers@0.15.0-next.183ba3e5", "@theia/markers@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-0.15.0-next.183ba3e5.tgz#4a51c30b71a415693dcd231e7982453c064b38b1"
+  integrity sha512-pRCiSi7+O5BwJddWVrrNuEFaOSHyJ+tekSH1TrBkVrb5WrEZ7xOyyUzVYxLlogTt4JZiezCPd4Rqdf0x0tUmIg==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/navigator" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/navigator" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
 
 "@theia/messages@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.14.0-next.0159cd5b.tgz#aa8efd81f7055e7dd8768c547394072b92e8826a"
-  integrity sha512-cj3N6/GMWOW5G5oP3jL2z5n1fLaXulh0FAC5geC1x2xjyUl6HcajQIA3sJVXbYEM7ci7+lGzRgvoWZkwhv7njg==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-0.15.0-next.183ba3e5.tgz#e29cb5e62c4adfa478589f1109a43341dbc685b9"
+  integrity sha512-Tsj+uox6sXYl1rxDkS50MCjQpNFT/ye1KbyN/08Z5nJLNUYZ926zKPnKA1ACmKLM9DhUtrstq8gogeGlixh9kQ==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
     lodash.throttle "^4.1.1"
     markdown-it "^8.4.0"
     react-perfect-scrollbar "^1.5.3"
     ts-md5 "^1.2.2"
 
-"@theia/monaco@0.14.0-next.0159cd5b", "@theia/monaco@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.14.0-next.0159cd5b.tgz#c1d0a7780baec9987c03a0494f6e5f8c59477196"
-  integrity sha512-zSrodn1WwCrP+ln5LQo4uat2nxZsJ8HrLNiSOGETbIwkQV8bx8NS02gSrg/p+EwivK3Whq6QSI76S89P3916Jw==
+"@theia/monaco@0.15.0-next.183ba3e5", "@theia/monaco@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-0.15.0-next.183ba3e5.tgz#8be196311418e3c9fc0da3f78535695dcf8751d6"
+  integrity sha512-yv3LN98k06OeLIMTojp6ppby/SQwHS2TDY8czq6wtU3dUVL2K2AnErZyZSgFIB/OvOewAJ0ULXPTzffyaARkUw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/languages" "0.14.0-next.0159cd5b"
-    "@theia/markers" "0.14.0-next.0159cd5b"
-    "@theia/outline-view" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/languages" "0.15.0-next.183ba3e5"
+    "@theia/markers" "0.15.0-next.183ba3e5"
+    "@theia/outline-view" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     deepmerge "2.0.1"
+    fast-plist "^0.1.2"
+    idb "^4.0.5"
     jsonc-parser "^2.0.2"
     monaco-css "^2.5.0"
     monaco-html "^2.5.2"
     onigasm "2.2.1"
     vscode-textmate "^4.0.1"
 
-"@theia/navigator@0.14.0-next.0159cd5b", "@theia/navigator@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.14.0-next.0159cd5b.tgz#a068109aa37c6b87ae7e58cafba6378045975c0a"
-  integrity sha512-AWP+tpmM9IR26Pf/kSj+PMBPrMKODVdPA/4fxHECgcF7QTsigaBscLPxPApwO9tpVS70vDy0+n7n9Px9dgeUcg==
+"@theia/navigator@0.15.0-next.183ba3e5", "@theia/navigator@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-0.15.0-next.183ba3e5.tgz#503b935ae7b1f6a9e450cbcd8402546558a1a25f"
+  integrity sha512-vb2jvrENps/wqNO+tTC4rzfHJzewwXeYqx3eyr2SVQcEHHLCA1HlaB0uQUJl4jGs8DYwyG0Fy1VlANgINI4DAw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     fuzzy "^0.1.3"
     minimatch "^3.0.4"
 
@@ -1988,52 +1990,52 @@
   dependencies:
     nan "2.10.0"
 
-"@theia/outline-view@0.14.0-next.0159cd5b", "@theia/outline-view@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.14.0-next.0159cd5b.tgz#9b6320d29457c75faf5259d0cc2b5ee4e1a93675"
-  integrity sha512-Go0NzzDACpHJervpxvLey7MBPajcdFMV93bfSH9Ur9rhaYqlOHiYZ6THtVuh9aqCW8rIZHZvf7x41L2y0fp0yA==
+"@theia/outline-view@0.15.0-next.183ba3e5", "@theia/outline-view@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-0.15.0-next.183ba3e5.tgz#9b27679bee377e7851d6c41fde54cd73cff002c7"
+  integrity sha512-Fts/F9PjOnkBhfAZYjlmzab5OiJLK8s02KuYWoKp7UdjaZ5qlP/JLCcLeT2GGuwHJhjPdc+MnXSkKYxjhGZ3bw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
 
-"@theia/output@0.14.0-next.0159cd5b":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.14.0-next.0159cd5b.tgz#d365ea6281141d9c04261389cb94863947f98cb2"
-  integrity sha512-NzVAZ4R5VWtfXeLBnPh15tRQN1yRy6TyoNwijklnV55cStOiVMboNi/+bZ0CuEphJFRJV4D2b1hZ+C0U3GXtWg==
+"@theia/output@0.15.0-next.183ba3e5":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/output/-/output-0.15.0-next.183ba3e5.tgz#3dec9eca696e703d0a5b0efaac9d00ff96eba2d9"
+  integrity sha512-yXkRZnbZ2mo3/lPYyXCfZTgalRL+B1j89u/4hnAcjBRAiYgtpJ7DOMhBi24C21N7Sk7G0hF06iNjTkr9Kuvxxg==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
 
-"@theia/preferences@0.14.0-next.0159cd5b", "@theia/preferences@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.14.0-next.0159cd5b.tgz#002271ddf9028c938e71d0344e16b6ded9adb520"
-  integrity sha512-QLTOHAp5Z74e+exDs1Cfb1x7Bb57l7OQhSQCjWItlhHI2/gXo0mHMNncwxAfG1IyerN9DTJxgYQpfYxICcThww==
+"@theia/preferences@0.15.0-next.183ba3e5", "@theia/preferences@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-0.15.0-next.183ba3e5.tgz#e78f6119b854bca4227929b876468353e4265962"
+  integrity sha512-4KEMxvF6PmUNtJ8OWK4Yg8kjvueAFc+nuoZ1/t745haSoX91X0zfp08uUL+yTNjO8nFJP1lJXGL73wBfDlXFJw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/json" "0.14.0-next.0159cd5b"
-    "@theia/monaco" "0.14.0-next.0159cd5b"
-    "@theia/userstorage" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/json" "0.15.0-next.183ba3e5"
+    "@theia/monaco" "0.15.0-next.183ba3e5"
+    "@theia/userstorage" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     jsonc-parser "^2.0.2"
 
-"@theia/process@0.14.0-next.0159cd5b", "@theia/process@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.14.0-next.0159cd5b.tgz#07da1525432da46178d2b6d9651cd500056d32c8"
-  integrity sha512-eCe4HwQ3sQ+Lndp0LwGSloXgg4D1+WsP0+TvbI+s2MPrWBwHEscYoM2Icstp9mI4il3oJ5eVzf5f9lbQlpDmzw==
+"@theia/process@0.15.0-next.183ba3e5", "@theia/process@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/process/-/process-0.15.0-next.183ba3e5.tgz#0acbef020b02389781bc633c55051b6498f85e93"
+  integrity sha512-aJsu332NMN/++Gg573kZIwuR8PMuL+PCUEULxPOV5emTW52CiCyR0xpKKcNRWlawo3eHdPBlX+zXZnV8oa6xwA==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
     "@theia/node-pty" "0.7.8-theia004"
     string-argv "^0.1.1"
 
-"@theia/scm@0.14.0-next.0159cd5b":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.14.0-next.0159cd5b.tgz#6575a0579d67e3ae5add4b83eaeb9325b34b24a8"
-  integrity sha512-8435H84woUbod2+AREbSGCeBefxLgnjn8a7epNw4pJR+f1xE7O0FwR51ieCntcuoS5mOXvVfWHpkYR89vQesoQ==
+"@theia/scm@0.15.0-next.183ba3e5":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-0.15.0-next.183ba3e5.tgz#ea4910cb2ae9d30023fb69a4980fe8df5999f4c9"
+  integrity sha512-ioKrUl5A7Dq7/5Uj9DcUIdHWf0KLPSJrs/G3OBGxub8rX0luVV/jcDRhl3/j4/zARoTMqH6+aMPbymPNmVzpEA==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/navigator" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/navigator" "0.15.0-next.183ba3e5"
     "@types/diff" "^3.2.2"
     "@types/p-debounce" "^1.0.1"
     diff "^3.4.0"
@@ -2042,81 +2044,81 @@
     ts-md5 "^1.2.2"
 
 "@theia/search-in-workspace@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.14.0-next.0159cd5b.tgz#46bcb8a401ba7c12fd8c02832e1241b19d9d05cd"
-  integrity sha512-VES+EehGHvk7tE0gNzxBy4nBqW7t3SjWZRa5O0JbDU9rQw7SITMvM5Qu8tl4houkqqX5uNxlAepl2NOw+hiUew==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-0.15.0-next.183ba3e5.tgz#381f9830c3b63ecfc571ff446a057b576c95c21a"
+  integrity sha512-QTRA9UvW58h5/0B9mTofuLh/HHtQsn4nVjmmR0YCBeFbJbRTTAAb7dGFKA8vmBZsgidV34auGwhKJg6msQqMHw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/navigator" "0.14.0-next.0159cd5b"
-    "@theia/process" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/navigator" "0.15.0-next.183ba3e5"
+    "@theia/process" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     vscode-ripgrep "^1.2.4"
 
 "@theia/task@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.14.0-next.0159cd5b.tgz#832484a26849e566645a1e5994bbdf7caf9e49c1"
-  integrity sha512-37eGfsSeYmoaqIZD5rbhMnoMpij8vvjUd8ABxCTqTVEntomOQwMApQgElh5ptWRH1rPAPPzmdIFsmjuFhGQQmw==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/task/-/task-0.15.0-next.183ba3e5.tgz#90bfdb525d9d3b4a390ce4db6864ec0516729cd0"
+  integrity sha512-IoZuaTmR/qaLJ3ZU9y0NeAYGwIwokbUmDtbyBlCu3EdZ+qjA1cVJ1ScQkASSLW0ttzmoetCseJBM/UYsQU0Aow==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/markers" "0.14.0-next.0159cd5b"
-    "@theia/monaco" "0.14.0-next.0159cd5b"
-    "@theia/preferences" "0.14.0-next.0159cd5b"
-    "@theia/process" "0.14.0-next.0159cd5b"
-    "@theia/terminal" "0.14.0-next.0159cd5b"
-    "@theia/variable-resolver" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/markers" "0.15.0-next.183ba3e5"
+    "@theia/monaco" "0.15.0-next.183ba3e5"
+    "@theia/preferences" "0.15.0-next.183ba3e5"
+    "@theia/process" "0.15.0-next.183ba3e5"
+    "@theia/terminal" "0.15.0-next.183ba3e5"
+    "@theia/variable-resolver" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     ajv "^6.5.3"
     jsonc-parser "^2.0.2"
     p-debounce "^2.1.0"
     vscode-uri "^1.0.8"
 
-"@theia/terminal@0.14.0-next.0159cd5b", "@theia/terminal@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.14.0-next.0159cd5b.tgz#3f7cf2c12a02c8304168cdb4f94a72ea88fbf6c8"
-  integrity sha512-YBkSVNrrPEtH0dXDb0lXAYndJqBMdLGYRmL1MjDrGbg/yBFUbh7cmqiMzOTwJsdKpTCkqbj1mMQUPLVPcGqhYw==
+"@theia/terminal@0.15.0-next.183ba3e5", "@theia/terminal@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-0.15.0-next.183ba3e5.tgz#5e30a2f5c6a17ff504c03442108bd4f18ea02002"
+  integrity sha512-TjOMI1Xu4/psPFqRKVvsDWdSeO2vHnirP+aduqnK+9rZlATLqCyS8cnAi1MqMBDKFar1zDPQVVI3944doWUusA==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/editor" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/process" "0.14.0-next.0159cd5b"
-    "@theia/workspace" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/editor" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/process" "0.15.0-next.183ba3e5"
+    "@theia/workspace" "0.15.0-next.183ba3e5"
     xterm "3.13.0"
 
 "@theia/textmate-grammars@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.14.0-next.0159cd5b.tgz#96dd8704ccf1a79877ad830cbcabaa6f37e741e7"
-  integrity sha512-yJERT3mDZ0sYN6KbWWn4e9fAXFuAgUrYHwd6ofN6VS7RH377gRIQLNaplmWUByfaKMgzsJ0za3e0kt8JfsQMtg==
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/textmate-grammars/-/textmate-grammars-0.15.0-next.183ba3e5.tgz#4f1c1b15863c7c4d67442e75ceb9bdb12ea10137"
+  integrity sha512-3+l67XWK8tVFc8lV0bZLZvuxxEpz3VWG4ZChdlhYZQIZp3Ezv6DhfjjY5tah+NqtRqK6kqKX8vVtpbnDGt2zcA==
   dependencies:
-    "@theia/monaco" "0.14.0-next.0159cd5b"
+    "@theia/monaco" "0.15.0-next.183ba3e5"
     vscode-textmate "^4.0.1"
 
-"@theia/userstorage@0.14.0-next.0159cd5b":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.14.0-next.0159cd5b.tgz#532a02ca38d6dc97af37733d140ab7e69c5c10a1"
-  integrity sha512-MlaALLqvZQt5akZJY5JNWo+tf6u4eKLqzkfPv6BYE+rqiRA2CH8vqXQuWtQyFgd7upzSSLDRENw8yNTPW/hW8Q==
+"@theia/userstorage@0.15.0-next.183ba3e5":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-0.15.0-next.183ba3e5.tgz#aebf84b840e3c90379d79be99ebbe6ca0ec8887b"
+  integrity sha512-6pw1EvkD8SzH96d2NwC2UacK0fLNpOAoYcNLylw+EFcDhxe70ChUE2b8deQfPvyLqG0uyKJWBFbruFpmQ1SF2A==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
 
-"@theia/variable-resolver@0.14.0-next.0159cd5b", "@theia/variable-resolver@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.14.0-next.0159cd5b.tgz#59071299163868195ca6d745f1235e8189fd8539"
-  integrity sha512-OhoaqTkqNkjCQ3MBhm8R6ZzGHEYJTsLrUooNodxvnpDLgRxAgWwlG296zwxg7+MAV4pDHPD1rq5hbZA0eWuumA==
+"@theia/variable-resolver@0.15.0-next.183ba3e5", "@theia/variable-resolver@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-0.15.0-next.183ba3e5.tgz#c64f9c8b9ba9150f617487367839de719910aebb"
+  integrity sha512-9fC3CcfYZnpyJKvLDiVo9PeAKITZ+OOKyUww5B0GJkHPRSqGPa8f2wB9GVDT5tt7Wn2qWGCQUPV5Ojb7hQk+0A==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
 
-"@theia/workspace@0.14.0-next.0159cd5b", "@theia/workspace@next":
-  version "0.14.0-next.0159cd5b"
-  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.14.0-next.0159cd5b.tgz#2894ca601c2a59449e48ea5b8b36f84402b88870"
-  integrity sha512-b+qSnC1jIWUHlS5pwI7TUb8coKjXBnnBPt4QyOUGiQfm858IqiO8zEPHPo8VHaudGLd4LRuTYfLi9kjjEqeOeA==
+"@theia/workspace@0.15.0-next.183ba3e5", "@theia/workspace@next":
+  version "0.15.0-next.183ba3e5"
+  resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-0.15.0-next.183ba3e5.tgz#b750202bfd06abd958df6adce9395073713fa53f"
+  integrity sha512-7k1zgMDngCAO8H+oguk9JMAhTSI/20omZ/EBaZ67edl3/moe0MDSsPMPmPWhqkOn+jnwrWmkl4NcGJuUzM2rPw==
   dependencies:
-    "@theia/core" "0.14.0-next.0159cd5b"
-    "@theia/filesystem" "0.14.0-next.0159cd5b"
-    "@theia/variable-resolver" "0.14.0-next.0159cd5b"
+    "@theia/core" "0.15.0-next.183ba3e5"
+    "@theia/filesystem" "0.15.0-next.183ba3e5"
+    "@theia/variable-resolver" "0.15.0-next.183ba3e5"
     ajv "^6.5.3"
     jsonc-parser "^2.0.2"
     moment "^2.21.0"
@@ -6514,12 +6516,12 @@ find-git-exec@^0.0.2:
     "@types/which" "^1.3.2"
     which "^2.0.1"
 
-find-git-repositories@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.1.tgz#2ba3374cbf6d6a8aadeb0370b86fdbb88a90e43c"
-  integrity sha512-v3Z6lE2+6Kat5ujOLucCGyijJ6yfv1/V7uauRYQshlSjv9177Rk3Eg8J6x2C/zAsQHJym4HHHLuOoy3Sl5KqzQ==
+find-git-repositories@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/find-git-repositories/-/find-git-repositories-0.1.2.tgz#401349f543c1000d1bf5e83f12a52ecc047b6e5d"
+  integrity sha512-HY5YSB/COXlr1v1qA/q0FyNg80yR5aH6vUEZtEnEhXQhkPcmXpvm/GLsAcCDcfNSay1ggUCScKcUwBXy+NSgQA==
   dependencies:
-    nan "^2.0.0"
+    nan "^2.14.0"
 
 find-root@^1.1.0:
   version "1.1.0"
@@ -7565,6 +7567,11 @@ icss-utils@^2.1.0:
   dependencies:
     postcss "^6.0.1"
 
+idb@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/idb/-/idb-4.0.5.tgz#23b930fbb0abce391e939c35b7b31a669e74041f"
+  integrity sha512-P+Fk9HT2h1DhXoE1YNK183SY+CRh2GHNh28de94sGwhe0bUA75JJeVJWt3SenE5p0BXK7maflIq29dl6UZHrFw==
+
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"