2 files changed, 22 insertions, 14 deletions

diff --git a/editors/code/src/commands/cargo_watch.ts b/editors/code/src/commands/cargo_watch.ts
index 1d939e28c..6ba794bb3 100644
--- a/editors/code/src/commands/cargo_watch.ts
+++ b/editors/code/src/commands/cargo_watch.ts
@@ -57,7 +57,7 @@ export class CargoWatchProvider implements vscode.Disposable {
             return;
         }
 
-        let args = 'check --message-format json';
+        let args = 'check --all-targets --message-format json';
         if (Server.config.cargoWatchOptions.checkArguments.length > 0) {
             // Excape the double quote string:
             args += ' ' + Server.config.cargoWatchOptions.checkArguments;
diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts
index 2521dff62..e1a68544a 100644
--- a/editors/code/src/highlighting.ts
+++ b/editors/code/src/highlighting.ts
@@ -13,23 +13,31 @@ export class Highlighter {
         string,
         vscode.TextEditorDecorationType
     > {
-        const decor = (color: string) =>
-            vscode.window.createTextEditorDecorationType({ color });
+        const colorContrib = (
+            tag: string
+        ): [string, vscode.TextEditorDecorationType] => {
+            const color = new vscode.ThemeColor('ralsp.' + tag);
+            const decor = vscode.window.createTextEditorDecorationType({
+                color
+            });
+            return [tag, decor];
+        };
 
         const decorations: Iterable<
             [string, vscode.TextEditorDecorationType]
         > = [
-            ['background', decor('#3F3F3F')],
-            ['comment', decor('#7F9F7F')],
-            ['string', decor('#CC9393')],
-            ['keyword', decor('#F0DFAF')],
-            ['function', decor('#93E0E3')],
-            ['parameter', decor('#94BFF3')],
-            ['builtin', decor('#DD6718')],
-            ['text', decor('#DCDCCC')],
-            ['attribute', decor('#BFEBBF')],
-            ['literal', decor('#DFAF8F')],
-            ['macro', decor('#DFAF8F')]
+            colorContrib('comment'),
+            colorContrib('string'),
+            colorContrib('keyword'),
+            colorContrib('keyword.control'),
+            colorContrib('keyword.unsafe'),
+            colorContrib('function'),
+            colorContrib('parameter'),
+            colorContrib('builtin'),
+            colorContrib('text'),
+            colorContrib('attribute'),
+            colorContrib('literal'),
+            colorContrib('macro')
         ];
 
         return new Map<string, vscode.TextEditorDecorationType>(decorations);