diff --git a/extensions/git/package.json b/extensions/git/package.json
index 1703e632acd..e7b19684f6d 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -839,7 +839,7 @@
     },
     "colors": [
       {
-        "id": "git.modifiedForeground",
+        "id": "gitDecoration.modifiedResourceForeground",
         "description": "%colors.modified%",
         "defaults": {
           "light": "#a76e12",
@@ -848,7 +848,7 @@
         }
       },
       {
-        "id": "git.deletedForeground",
+        "id": "gitDecoration.deletedResourceForeground",
         "description": "%colors.deleted%",
         "defaults": {
           "light": "#ad0707",
@@ -857,7 +857,7 @@
         }
       },
       {
-        "id": "git.untrackedForeground",
+        "id": "gitDecoration.untrackedResourceForeground",
         "description": "%colors.untracked%",
         "defaults": {
           "light": "#019001",
@@ -866,7 +866,7 @@
         }
       },
       {
-        "id": "git.ignoredForeground",
+        "id": "gitDecoration.ignoredResourceForeground",
         "description": "%colors.ignored%",
         "defaults": {
           "light": "#8E8E90",
@@ -875,7 +875,7 @@
         }
       },
       {
-        "id": "git.conflictForeground",
+        "id": "gitDecoration.conflictingResourceForeground",
         "description": "%colors.conflict%",
         "defaults": {
           "light": "#6c6cc4",
diff --git a/extensions/git/src/decorationProvider.ts b/extensions/git/src/decorationProvider.ts
index f822b203b03..614a793e4af 100644
--- a/extensions/git/src/decorationProvider.ts
+++ b/extensions/git/src/decorationProvider.ts
@@ -40,7 +40,7 @@ class GitIgnoreDecorationProvider implements DecorationProvider {
 			if (ignored) {
 				return <DecorationData>{
 					priority: 3,
-					color: new ThemeColor('git.ignoredForeground')
+					color: new ThemeColor('gitDecoration.ignoredResourceForeground')
 				};
 			}
 		});
diff --git a/extensions/git/src/repository.ts b/extensions/git/src/repository.ts
index a0f38e4ecdb..488a4bfb144 100644
--- a/extensions/git/src/repository.ts
+++ b/extensions/git/src/repository.ts
@@ -218,16 +218,16 @@ export class Resource implements SourceControlResourceState {
 		switch (this.type) {
 			case Status.INDEX_MODIFIED:
 			case Status.MODIFIED:
-				return new ThemeColor('git.modifiedForeground');
+				return new ThemeColor('gitDecoration.modifiedResourceForeground');
 			case Status.INDEX_DELETED:
 			case Status.DELETED:
-				return new ThemeColor('git.deletedForeground');
+				return new ThemeColor('gitDecoration.deletedResourceForeground');
 			case Status.INDEX_ADDED: // todo@joh - special color?
 			case Status.INDEX_RENAMED: // todo@joh - special color?
 			case Status.UNTRACKED:
-				return new ThemeColor('git.untrackedForeground');
+				return new ThemeColor('gitDecoration.untrackedResourceForeground');
 			case Status.IGNORED:
-				return new ThemeColor('git.ignoredForeground');
+				return new ThemeColor('gitDecoration.ignoredResourceForeground');
 			case Status.INDEX_COPIED:
 			case Status.BOTH_DELETED:
 			case Status.ADDED_BY_US:
@@ -236,7 +236,7 @@ export class Resource implements SourceControlResourceState {
 			case Status.DELETED_BY_US:
 			case Status.BOTH_ADDED:
 			case Status.BOTH_MODIFIED:
-				return new ThemeColor('git.conflictForeground');
+				return new ThemeColor('gitDecoration.conflictingResourceForeground');
 			default:
 				return undefined;
 		}