diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
index c9b356b..677c17f 100644
--- a/.github/workflows/on_push.yml
+++ b/.github/workflows/on_push.yml
@@ -70,9 +70,9 @@ jobs:
       - 
         name: Update version
         run: |
-          (Get-Content -Path Dev16\source.extension.vsixmanifest) |
+          (Get-Content -Path Dev16\publishManifest.json) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
-              Set-Content -Path Dev16\source.extension.vsixmanifest
+              Set-Content -Path Dev16\publishManifest.json
           (Get-Content -Path Dev16\Properties\AssemblyInfo.cs) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev16\Properties\AssemblyInfo.cs
@@ -118,9 +118,9 @@ jobs:
       - 
         name: Update version
         run: |
-          (Get-Content -Path Dev17\source.extension.vsixmanifest) |
+          (Get-Content -Path Dev17\publishManifest.json) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
-              Set-Content -Path Dev17\source.extension.vsixmanifest
+              Set-Content -Path Dev17\publishManifest.json
           (Get-Content -Path Dev17\Properties\AssemblyInfo.cs) |
             ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} |
               Set-Content -Path Dev17\Properties\AssemblyInfo.cs
@@ -165,7 +165,7 @@ jobs:
         uses: cezarypiatek/VsixPublisherAction@1.1
         with:
           extension-file: ${{ github.workspace }}\build\WakaTime.Dev16.vsix\WakaTime.Dev16.vsix
-          publish-manifest-file: publishManifest.json
+          publish-manifest-file: Dev16\publishManifest.json
           personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }}
 
   publish-dev17:
@@ -187,7 +187,7 @@ jobs:
         uses: cezarypiatek/VsixPublisherAction@1.1
         with:
           extension-file: ${{ github.workspace }}\build\WakaTime.Dev17.vsix\WakaTime.Dev17.vsix
-          publish-manifest-file: publishManifest.json
+          publish-manifest-file: Dev17\publishManifest.json
           personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }}
   
   release:
diff --git a/Dev16/publishManifest.json b/Dev16/publishManifest.json
new file mode 100644
index 0000000..5ffab0a
--- /dev/null
+++ b/Dev16/publishManifest.json
@@ -0,0 +1,49 @@
+{
+    "$schema": "http://json.schemastore.org/vsix-publish",
+    "categories": [ "coding", "reporting", "programming languages" ],
+    "identity": {
+        "internalName": "WakaTime",
+        "displayName": "WakaTime",
+        "description": "Metrics, insights, and time tracking automatically generated from your programming activity.",
+        "tags": [ "Analytics", "Coding","Productivity", "Productivity Tool", "Time Tracking", "Timer", "Code Time", "Metrics", "Time Tracker", "Reports" ],
+        "vsixId": "52d9c3ff-c893-408e-95e4-d7484ec7fa47",
+        "version": "1.0.0",
+        "installTargets": [
+            {
+                "sku": "Microsoft.VisualStudio.Community",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Pro",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Enterprise",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.IntegratedShell",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Ultimate",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Premium",
+                "version": "[15.0,17.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.VSLS",
+                "version": "[15.0,17.0)"
+            }
+        ]
+    },
+
+    "overview": "OVERVIEW.md",
+    "priceCategory": "free",
+    "publisher": "WakaTime",
+    "private": false,
+    "qna": true,
+    "repo": "https://github.com/wakatime/visualstudio-wakatime"
+}
diff --git a/Dev16/source.extension.vsixmanifest b/Dev16/source.extension.vsixmanifest
index bd32823..5682c48 100644
--- a/Dev16/source.extension.vsixmanifest
+++ b/Dev16/source.extension.vsixmanifest
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-	<Metadata>
-		<Identity Publisher="WakaTime" Version="1.0.0" Id="52d9c3ff-c893-408e-95e4-d7484ec7fa47" Language="en-US" />
-		<DisplayName>WakaTime</DisplayName>
-		<Description xml:space="preserve">Metrics, insights, and time tracking automatically generated from your programming activity.</Description>
-		<MoreInfo>https://github.com/wakatime/visualstudio-wakatime</MoreInfo>
-		<License>LICENSE</License>
-		<Icon>Assets\wakatime-120.png</Icon>
-		<PreviewImage>Assets\dashboard.png</PreviewImage>
-		<Tags>metrics, time tracker, productivity, reports</Tags>
-	</Metadata>
-
-	<Installation>
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Pro" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Enterprise" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Ultimate" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Premium" />
-		<InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.VSLS" />
-	</Installation>
-
 	<Dependencies>
 		<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
 		<Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0,17.0)" />
diff --git a/Dev17/publishManifest.json b/Dev17/publishManifest.json
new file mode 100644
index 0000000..e1be172
--- /dev/null
+++ b/Dev17/publishManifest.json
@@ -0,0 +1,33 @@
+{
+    "$schema": "http://json.schemastore.org/vsix-publish",
+    "categories": [ "coding", "reporting", "programming languages" ],
+    "identity": {
+        "internalName": "WakaTime",
+        "displayName": "WakaTime",
+        "description": "Metrics, insights, and time tracking automatically generated from your programming activity.",
+        "tags": [ "Analytics", "Coding","Productivity", "Productivity Tool", "Time Tracking", "Timer", "Code Time", "Metrics", "Time Tracker", "Reports" ],
+        "vsixId": "41DB9DFA-9F21-45A4-B111-22FBD1C3AD94",
+        "version": "1.0.0",
+        "installTargets": [
+            {
+                "sku": "Microsoft.VisualStudio.Community",
+                "version": "[17.0,18.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Pro",
+                "version": "[17.0,18.0)"
+            },
+            {
+                "sku": "Microsoft.VisualStudio.Enterprise",
+                "version": "[17.0,18.0)"
+            }
+        ]
+    },
+
+    "overview": "OVERVIEW.md",
+    "priceCategory": "free",
+    "publisher": "WakaTime",
+    "private": false,
+    "qna": true,
+    "repo": "https://github.com/wakatime/visualstudio-wakatime"
+}
diff --git a/Dev17/source.extension.vsixmanifest b/Dev17/source.extension.vsixmanifest
index a5b3a9e..974e887 100644
--- a/Dev17/source.extension.vsixmanifest
+++ b/Dev17/source.extension.vsixmanifest
@@ -1,28 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
-    <Metadata>
-        <Identity Publisher="WakaTime" Version="1.0.0" Id="41DB9DFA-9F21-45A4-B111-22FBD1C3AD94" Language="en-US" />
-        <DisplayName>WakaTime</DisplayName>
-        <Description xml:space="preserve">Metrics, insights, and time tracking automatically generated from your programming activity.</Description>
-        <MoreInfo>https://github.com/wakatime/visualstudio-wakatime</MoreInfo>
-        <License>LICENSE</License>
-        <Icon>Assets\wakatime-120.png</Icon>
-        <PreviewImage>Assets\dashboard.png</PreviewImage>
-        <Tags>metrics, time tracker, productivity, reports</Tags>
-    </Metadata>
-
-    <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[17.0,18.0)">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-        <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[17.0,18.0)">
-            <ProductArchitecture>amd64</ProductArchitecture>
-        </InstallationTarget>
-    </Installation>
-
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.8,)" />
         <Dependency Id="Microsoft.VisualStudio.MPF.16.0" DisplayName="Visual Studio MPF 16.0" d:Source="Installed" Version="[16.0,17.0)" />
diff --git a/publishManifest.json b/publishManifest.json
deleted file mode 100644
index 0302378..0000000
--- a/publishManifest.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "$schema": "http://json.schemastore.org/vsix-publish",
-    "categories": [ "coding", "reporting", "programming languages" ],
-    "identity": {
-        "internalName": "WakaTime"
-    },
-    "overview": "OVERVIEW.md",
-    "priceCategory": "free",
-    "publisher": "WakaTime",
-    "private": false,
-    "qna": true,
-    "repo": "https://github.com/wakatime/visualstudio-wakatime"
-}