diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index f5e20e12..f726a3ca 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -55,9 +55,28 @@ jobs:
           msbuild win32\hexchat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
         shell: cmd
 
+      - name: Creating Appx
+        run: |
+          cp -r ..\hexchat-build\${{ matrix.platform }}\rel ..\hexchat-appx
+          .\win32\version-template.ps1 win32\AppxManifest.xml.in $(Join-Path $(Resolve-Path ..\hexchat-appx) AppxManifest.xml)
+          cd ..\hexchat-appx
+          rm plugins\hcperl.dll
+          rm plugins\hcpython2.dll
+          rm plugins\hcpython3.dll
+          rm plugins\hcupd.dll
+          rm -r python
+          rm *.pyd
+          rm WinSparkle.dll
+          rm portable-mode
+          rm hexchat-text.exe
+          rm thememan.exe
+          makeappx pack /d . /p hexchat-${{ matrix.arch }}.appx
+        shell: powershell
+
       - name: Preparing Artifacts
         run: |
           move ..\hexchat-build\${{ matrix.platform }}\HexChat*.exe .\
+          move ..\hexchat-appx\hexchat-${{ matrix.arch }}.appx .\
           move ..\hexchat-build .\
         shell: cmd
 
@@ -68,5 +87,10 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: Build Files ${{ matrix.arch  }}
+          name: Build Files ${{ matrix.arch }}
           path: hexchat-build
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Appx Files ${{ matrix.arch }}
+          path: hexchat-${{ matrix.arch }}.appx
diff --git a/win32/AppxManifest.xml.in b/win32/AppxManifest.xml.in
new file mode 100644
index 00000000..f753ea2c
--- /dev/null
+++ b/win32/AppxManifest.xml.in
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap uap3 uap10 rescap">
+  <Identity Name="39215TingPing.HexChat" Publisher="CN=0330FC06-4EE0-4AAB-8FB9-F9B6C1FA037F" Version="<#= [string]::Join('.', $versionParts) #>.0" ProcessorArchitecture="x86" />
+  <Properties>
+    <DisplayName>HexChat</DisplayName>
+    <PublisherDisplayName>TingPing</PublisherDisplayName>
+    <Description>Chat Client</Description>
+    <Logo>Assets\StoreLogo.png</Logo>
+    <uap10:PackageIntegrity>
+      <uap10:Content Enforcement="on" />
+    </uap10:PackageIntegrity>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource uap:Scale="100" />
+    <Resource uap:Scale="125" />
+    <Resource uap:Scale="150" />
+    <Resource uap:Scale="200" />
+    <Resource uap:Scale="400" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.1" />
+    <PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.24217.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="HexChat" Executable="hexchat.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements DisplayName="HexChat" Description="HexChat" BackgroundColor="transparent" Square150x150Logo="Assets\AppMedTile.png" Square44x44Logo="Assets\AppList.png">
+      </uap:VisualElements>
+      <Extensions>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol Name="irc" Parameters="--url=&quot;%1&quot;">
+            <uap:DisplayName>IRC</uap:DisplayName>
+            <uap:Logo>Assets\irc.png</uap:Logo>
+          </uap3:Protocol>
+        </uap3:Extension>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol Name="ircs" Parameters="--url=&quot;%1&quot;">
+            <uap:DisplayName>IRCS</uap:DisplayName>
+            <uap:Logo>Assets\irc.png</uap:Logo>
+          </uap3:Protocol>
+        </uap3:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>
\ No newline at end of file
diff --git a/win32/Assets/AppList.png b/win32/Assets/AppList.png
new file mode 100644
index 00000000..08c88306
Binary files /dev/null and b/win32/Assets/AppList.png differ
diff --git a/win32/Assets/AppMedTile.png b/win32/Assets/AppMedTile.png
new file mode 100644
index 00000000..08c88306
Binary files /dev/null and b/win32/Assets/AppMedTile.png differ
diff --git a/win32/Assets/HEXCHAT-Square150x150Logo.scale-100.png b/win32/Assets/HEXCHAT-Square150x150Logo.scale-100.png
new file mode 100644
index 00000000..7dbf23a6
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square150x150Logo.scale-100.png differ
diff --git a/win32/Assets/HEXCHAT-Square150x150Logo.scale-125.png b/win32/Assets/HEXCHAT-Square150x150Logo.scale-125.png
new file mode 100644
index 00000000..afdc2814
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square150x150Logo.scale-125.png differ
diff --git a/win32/Assets/HEXCHAT-Square150x150Logo.scale-150.png b/win32/Assets/HEXCHAT-Square150x150Logo.scale-150.png
new file mode 100644
index 00000000..a36a31ee
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square150x150Logo.scale-150.png differ
diff --git a/win32/Assets/HEXCHAT-Square150x150Logo.scale-200.png b/win32/Assets/HEXCHAT-Square150x150Logo.scale-200.png
new file mode 100644
index 00000000..66ad4994
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square150x150Logo.scale-200.png differ
diff --git a/win32/Assets/HEXCHAT-Square150x150Logo.scale-400.png b/win32/Assets/HEXCHAT-Square150x150Logo.scale-400.png
new file mode 100644
index 00000000..d72713bd
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square150x150Logo.scale-400.png differ
diff --git a/win32/Assets/HEXCHAT-Square310x310Logo.scale-100.png b/win32/Assets/HEXCHAT-Square310x310Logo.scale-100.png
new file mode 100644
index 00000000..608a0648
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square310x310Logo.scale-100.png differ
diff --git a/win32/Assets/HEXCHAT-Square310x310Logo.scale-125.png b/win32/Assets/HEXCHAT-Square310x310Logo.scale-125.png
new file mode 100644
index 00000000..f1dd9df7
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square310x310Logo.scale-125.png differ
diff --git a/win32/Assets/HEXCHAT-Square310x310Logo.scale-150.png b/win32/Assets/HEXCHAT-Square310x310Logo.scale-150.png
new file mode 100644
index 00000000..26c7e96a
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square310x310Logo.scale-150.png differ
diff --git a/win32/Assets/HEXCHAT-Square310x310Logo.scale-200.png b/win32/Assets/HEXCHAT-Square310x310Logo.scale-200.png
new file mode 100644
index 00000000..786633e4
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square310x310Logo.scale-200.png differ
diff --git a/win32/Assets/HEXCHAT-Square310x310Logo.scale-400.png b/win32/Assets/HEXCHAT-Square310x310Logo.scale-400.png
new file mode 100644
index 00000000..bd380b5f
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square310x310Logo.scale-400.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.scale-100.png b/win32/Assets/HEXCHAT-Square44x44Logo.scale-100.png
new file mode 100644
index 00000000..8604093d
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.scale-100.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.scale-125.png b/win32/Assets/HEXCHAT-Square44x44Logo.scale-125.png
new file mode 100644
index 00000000..879fdaae
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.scale-125.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.scale-150.png b/win32/Assets/HEXCHAT-Square44x44Logo.scale-150.png
new file mode 100644
index 00000000..114d04bc
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.scale-150.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.scale-200.png b/win32/Assets/HEXCHAT-Square44x44Logo.scale-200.png
new file mode 100644
index 00000000..54b3924d
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.scale-200.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.scale-400.png b/win32/Assets/HEXCHAT-Square44x44Logo.scale-400.png
new file mode 100644
index 00000000..1ed9ff37
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.scale-400.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16.png
new file mode 100644
index 00000000..1b5c824a
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16_altform-unplated.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16_altform-unplated.png
new file mode 100644
index 00000000..1b5c824a
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-16_altform-unplated.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24.png
new file mode 100644
index 00000000..dd9c234d
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24_altform-unplated.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 00000000..dd9c234d
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256.png
new file mode 100644
index 00000000..08c88306
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256_altform-unplated.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256_altform-unplated.png
new file mode 100644
index 00000000..08c88306
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-256_altform-unplated.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32.png
new file mode 100644
index 00000000..8d873493
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32_altform-unplated.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32_altform-unplated.png
new file mode 100644
index 00000000..8d873493
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-32_altform-unplated.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48.png
new file mode 100644
index 00000000..ba247527
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48.png differ
diff --git a/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48_altform-unplated.png b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48_altform-unplated.png
new file mode 100644
index 00000000..ba247527
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square44x44Logo.targetsize-48_altform-unplated.png differ
diff --git a/win32/Assets/HEXCHAT-Square71x71Logo.scale-100.png b/win32/Assets/HEXCHAT-Square71x71Logo.scale-100.png
new file mode 100644
index 00000000..574ef612
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square71x71Logo.scale-100.png differ
diff --git a/win32/Assets/HEXCHAT-Square71x71Logo.scale-125.png b/win32/Assets/HEXCHAT-Square71x71Logo.scale-125.png
new file mode 100644
index 00000000..685768a6
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square71x71Logo.scale-125.png differ
diff --git a/win32/Assets/HEXCHAT-Square71x71Logo.scale-150.png b/win32/Assets/HEXCHAT-Square71x71Logo.scale-150.png
new file mode 100644
index 00000000..31f6b795
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square71x71Logo.scale-150.png differ
diff --git a/win32/Assets/HEXCHAT-Square71x71Logo.scale-200.png b/win32/Assets/HEXCHAT-Square71x71Logo.scale-200.png
new file mode 100644
index 00000000..5c3f35c8
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square71x71Logo.scale-200.png differ
diff --git a/win32/Assets/HEXCHAT-Square71x71Logo.scale-400.png b/win32/Assets/HEXCHAT-Square71x71Logo.scale-400.png
new file mode 100644
index 00000000..94c5d2e8
Binary files /dev/null and b/win32/Assets/HEXCHAT-Square71x71Logo.scale-400.png differ
diff --git a/win32/Assets/HEXCHAT-Wide310x150Logo.scale-100.png b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-100.png
new file mode 100644
index 00000000..e463750f
Binary files /dev/null and b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-100.png differ
diff --git a/win32/Assets/HEXCHAT-Wide310x150Logo.scale-125.png b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-125.png
new file mode 100644
index 00000000..2632212f
Binary files /dev/null and b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-125.png differ
diff --git a/win32/Assets/HEXCHAT-Wide310x150Logo.scale-150.png b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-150.png
new file mode 100644
index 00000000..2d67826a
Binary files /dev/null and b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-150.png differ
diff --git a/win32/Assets/HEXCHAT-Wide310x150Logo.scale-200.png b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-200.png
new file mode 100644
index 00000000..d3fb83e7
Binary files /dev/null and b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-200.png differ
diff --git a/win32/Assets/HEXCHAT-Wide310x150Logo.scale-400.png b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-400.png
new file mode 100644
index 00000000..b04a17a0
Binary files /dev/null and b/win32/Assets/HEXCHAT-Wide310x150Logo.scale-400.png differ
diff --git a/win32/Assets/StoreLogo.png b/win32/Assets/StoreLogo.png
new file mode 100644
index 00000000..08c88306
Binary files /dev/null and b/win32/Assets/StoreLogo.png differ
diff --git a/win32/Assets/irc.png b/win32/Assets/irc.png
new file mode 100644
index 00000000..933967e5
Binary files /dev/null and b/win32/Assets/irc.png differ
diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index 2fc7437b..5aaeb1d3 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -56,6 +56,7 @@
     <None Include="$(HexChatBin)thememan.exe" />
     <None Include="changelog.url" />
     <None Include="readme.url" />
+    <None Include="..\Assets\*" />
 
     <None Include="$(DepsRoot)\bin\lua51.dll" />
     <None Include="$(DepsRoot)\bin\girepository-1.0-1.dll" />