From 680943ba2946baa464b520767b90d734f5ead08c Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Thu, 16 Jul 2026 23:58:21 +0200
Subject: [PATCH 01/11] WIP: Shell extension

---
 PasteIntoFile.sln                             |   2 +
 PasteIntoFile/ExplorerUtil.cs                 | 124 ++++++
 PasteIntoFile/PasteIntoFile.csproj            |   6 +
 .../Properties/Resources.Designer.cs          |  13 +-
 PasteIntoFile/Properties/Resources.resx       |   3 +
 PasteIntoFile/Resources/icon150.png           | Bin 0 -> 5658 bytes
 PasteIntoFile/Resources/icon44.png            | Bin 0 -> 1444 bytes
 PasteIntoFile/Wizard.Designer.cs              |  57 ++-
 PasteIntoFile/Wizard.cs                       |  64 +++-
 PasteIntoFileShellExtension/AppxManifest.xml  |  40 ++
 PasteIntoFileShellExtension/Command.cs        | 358 ++++++++++++++++++
 .../PasteIntoFileShellExtension.csproj        |  23 ++
 12 files changed, 652 insertions(+), 38 deletions(-)
 create mode 100644 PasteIntoFile/Resources/icon150.png
 create mode 100644 PasteIntoFile/Resources/icon44.png
 create mode 100644 PasteIntoFileShellExtension/AppxManifest.xml
 create mode 100644 PasteIntoFileShellExtension/Command.cs
 create mode 100644 PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj

diff --git a/PasteIntoFile.sln b/PasteIntoFile.sln
index 07216d8..7623209 100644
--- a/PasteIntoFile.sln
+++ b/PasteIntoFile.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile", "PasteIntoFile\PasteIntoFile.csproj", "{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFileShellExtension", "PasteIntoFileShellExtension\PasteIntoFileShellExtension.csproj", "{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/PasteIntoFile/ExplorerUtil.cs b/PasteIntoFile/ExplorerUtil.cs
index c861512..8a510b4 100644
--- a/PasteIntoFile/ExplorerUtil.cs
+++ b/PasteIntoFile/ExplorerUtil.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using SHDocVw;
 using Shell32;
 
@@ -438,6 +440,128 @@ public static void MoveToRecycleBin(string path) {
         }
 
 
+
+        private const string Win11ContextMenuPackageName = "PasteIntoFile.Dev.ShellExtension";
+
+        public static bool IsWin11ContextMenuRegistered() {
+            string output;
+            var exitCode = RunPowerShell(
+                "if (Get-AppxPackage -Name " + PowerShellQuote(Win11ContextMenuPackageName) + ") { exit 0 } else { exit 1 }",
+                out output,
+                false
+            );
+
+            return exitCode == 0;
+        }
+
+        public static void SetWin11ContextMenuRegistered(bool registered) {
+            if (registered) {
+                RegisterWin11ContextMenu();
+            } else {
+                UnregisterWin11ContextMenu();
+            }
+        }
+
+        public static void RegisterWin11ContextMenu() {
+            var directory = Path.GetDirectoryName(Application.ExecutablePath);
+
+            if (string.IsNullOrWhiteSpace(directory)) {
+                throw new InvalidOperationException("Der Installationsordner konnte nicht ermittelt werden.");
+            }
+
+            var manifest = Path.Combine(directory, "AppxManifest.xml");
+
+            if (!File.Exists(manifest)) {
+                throw new FileNotFoundException(
+                    "Das AppxManifest.xml wurde nicht gefunden. Die Win11-Menüintegration kann nicht registriert werden.",
+                    manifest
+                );
+            }
+
+            string output;
+            RunPowerShell(
+                "$ErrorActionPreference = 'Stop'; " +
+                "Add-AppxPackage " +
+                "-Register " + PowerShellQuote(manifest) + " " +
+                "-ExternalLocation " + PowerShellQuote(directory) + " " +
+                "-ForceApplicationShutdown",
+                out output,
+                true
+            );
+
+            //RestartExplorer();
+        }
+
+        public static void UnregisterWin11ContextMenu() {
+            string output;
+            RunPowerShell(
+                "$ErrorActionPreference = 'Stop'; " +
+                "$package = Get-AppxPackage -Name " + PowerShellQuote(Win11ContextMenuPackageName) + "; " +
+                "if ($package) { $package | Remove-AppxPackage }",
+                out output,
+                true
+            );
+
+            //RestartExplorer();
+        }
+
+        private static string PowerShellQuote(string value) {
+            return "'" + value.Replace("'", "''") + "'";
+        }
+
+        private static int RunPowerShell(string command, out string output, bool throwOnError) {
+            var encodedCommand = Convert.ToBase64String(Encoding.Unicode.GetBytes(command));
+
+            var startInfo = new ProcessStartInfo {
+                FileName = "powershell.exe",
+                Arguments = "-NoProfile -ExecutionPolicy Bypass -EncodedCommand " + encodedCommand,
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true
+            };
+
+            using (var process = Process.Start(startInfo)) {
+                if (process == null) {
+                    throw new InvalidOperationException("PowerShell konnte nicht gestartet werden.");
+                }
+
+                var stdout = process.StandardOutput.ReadToEnd();
+                var stderr = process.StandardError.ReadToEnd();
+
+                process.WaitForExit();
+
+                output = stdout;
+
+                if (!string.IsNullOrWhiteSpace(stderr)) {
+                    output += Environment.NewLine + stderr;
+                }
+
+                if (throwOnError && process.ExitCode != 0) {
+                    throw new InvalidOperationException(output.Trim());
+                }
+
+                return process.ExitCode;
+            }
+        }
+
+        private static void RestartExplorer() {
+            foreach (var process in Process.GetProcessesByName("explorer")) {
+                try {
+                    process.Kill();
+                } catch {
+                    // Ignorieren: Explorer wird gleich neu gestartet.
+                }
+            }
+
+            Process.Start("explorer.exe");
+        }
+
+
+
+
+
+
         private static IntPtr PathToPidl(string path, bool special = false) {
             if (special) {
                 // Will use special paths, e.g. "::{374DE290-123F-4565-9164-39C4925E467B}" for Downloads
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index ec7043b..3a8a524 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -155,6 +155,12 @@
             <EmbedInteropTypes>True</EmbedInteropTypes>
         </COMReference>
     </ItemGroup>
+    <Target Name="CopyShellExtension" AfterTargets="Build">
+        <ItemGroup>
+            <ShellFiles Include="..\PasteIntoFileShellExtension\bin\$(Configuration)\**\*.*" />
+        </ItemGroup>
+        <Copy SourceFiles="@(ShellFiles)" DestinationFiles="@(ShellFiles-&gt;'$(OutDir)/%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+    </Target>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PasteIntoFile/Properties/Resources.Designer.cs b/PasteIntoFile/Properties/Resources.Designer.cs
index fcae6cb..0c3047d 100644
--- a/PasteIntoFile/Properties/Resources.Designer.cs
+++ b/PasteIntoFile/Properties/Resources.Designer.cs
@@ -215,6 +215,15 @@ internal static string str_contextentry_paste_into_existing_file {
             }
         }
 
+        /// <summary>
+        ///   Looks up a localized string similar to Use new Windows 11 context menu.
+        /// </summary>
+        internal static string str_contextentry_win11 {
+            get {
+                return ResourceManager.GetString("str_contextentry_win11", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Batch mode.
         /// </summary>
@@ -597,7 +606,7 @@ internal static string str_settings {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to Subfolder template.
+        ///   Looks up a localized string similar to Folder template.
         /// </summary>
         internal static string str_subfolder_template {
             get {
@@ -646,7 +655,7 @@ internal static string str_template_edit_info_url {
         }
 
         /// <summary>
-        ///   Looks up a localized string similar to The subfolder template is appended to the folder path when executing Paste Into File with pressed CTRL key. Absolute paths are also supported and will replace the folder..
+        ///   Looks up a localized string similar to The folder template is appended to the folder path when executing Paste Into File with pressed CTRL key. Absolute paths are also supported and will replace the folder..
         /// </summary>
         internal static string str_template_edit_subfolder_info {
             get {
diff --git a/PasteIntoFile/Properties/Resources.resx b/PasteIntoFile/Properties/Resources.resx
index 76e29ec..bc00a9d 100644
--- a/PasteIntoFile/Properties/Resources.resx
+++ b/PasteIntoFile/Properties/Resources.resx
@@ -93,6 +93,9 @@
     <value>Paste into file</value>
     <comment>Context menu entry for pasting</comment>
   </data>
+  <data name="str_contextentry_win11" xml:space="preserve">
+    <value>Use new Windows 11 context menu</value>
+  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Select a folder for saving this file</value>
     <comment>str_select_folder
diff --git a/PasteIntoFile/Resources/icon150.png b/PasteIntoFile/Resources/icon150.png
new file mode 100644
index 0000000000000000000000000000000000000000..175f41967bdf70968b2384e1624278a8f78933a6
GIT binary patch
literal 5658
zcmX|F2RvL&yFW@;eTm*l(Kd*ZkSMWwjc8dVtRT_5gpC$f2@*thMYLCBi5k6IHaf9_
zAbQjdBBCs!e&@aSyLZkrXMQv1%=~7a_J5vvVQQkwM9)hP005J|o|YNdV*jlW8t|<`
z;kO7j6ai+saEi%3SOnOieym}v0RWZB3@45kz`n4Po|!QKpsoTyBpLvYz@f;W01zY#
z0P9Eqxb+qQxO}sk?x}zuXdW8sY60i}KL4~9rhy}LzIxUH0KjnZ-%0_z%i;zHX#@3*
zwQ1LBp&T%(OC-1!0C3prYiU>nPi<y<B=PIk_MBUeC1<Q<gc0#AKGVm4Py#+T@QbTd
z2ZkqflzN>Bl%js`^-|elpnco)1QHDTK@X{=6|AoTy#p7%3`tSCC+bxG8{-`*CH2W8
zYjBZN{`9HJ*4ppl<GhlVO&4R8X8CG)O@SiCjTdtAv!@&8g=azQ{85>Ff5qbJ`rjRj
z>1y&e_O(d>S6MU#754D4B~_+>fre1>^1=YsOGrj#-!pnahDf@0=F>9a(YcZ;`+kfp
zX8GQmEe*;E-<(9xU>A|M{J{2CkIU5DX#l*V*5xB~$Be!}B{E5+3h>`)YZTcU^A$`q
zaDB-3!6YQGH=ij|6H-YbD?&XB6nt%&8Hp|}PZLHT!XeVn4X6+oDnye@c6wt}_<R&9
zzWsS@`0*C7XNw&>ZyXBqcJ=qK`czx1s1I@DfWL)9nkZmiwtsBUQ0B;s@Pw@0v6Yn-
zsfe@P+@bSDt~LaKWP>+ADft$!&50vZO^sIcWX2+Xv_IeOh-0}sA2jix8Z4T9&T<7y
z#p@cYA%bnb3vhR5=jGO5l`{vQmTjHAnZ|(rfsnj~iiLK$F{rDx)%ik4T%l0J$#yde
zg=)H#8sEh|ddG5ChnprgE-uZ>%Zu3CtH(#O%ewtkn(80nrLxdVOfiy>dI~LEJ+BgK
z@8@!l`q}pR+ngN1C;UAHZ`?l?3xu*#8c4j*62&elRfej`D3J`eS`TvQS9kehJDYBB
zi1GM~CsF;(%F6ncot-U^0RD(yQN)Y95lz+8Dl8~?lKk=|xli95cKIMhhthBmk`GMT
z*xEL~?sGO`iMV|OHZnXsT!+Ww$5XyJp?`C^u~%3mx#;WXS<<fE=FXMXxpnIntjF)Y
zoROQ-rYs|tqFogIJuARGx^_uZlogH`v6ZOMgOoSXN}be?7q0IT#9khD_`J<R{}`$3
zxTqZ>#LHGb*ghianoTjzD9FGo$z)mEK9blsRp+I14gUcFOTgi-3>}<`;%c-c$Pf`b
z>CZQKzi3G_niG{T!nxs)fjY0|{QM4CV{>y$sR}DAs}rAy<LRQ&!n+Q=EB^Pno!kuE
zUO~+~wJMgWdsee<mv7YlnyM`!<vjb%({TK|Ih#l{QQa=$KmZM-kVeCF>1(aK#M>n3
zGS36eiZk3!l2-nmD=f4Gf5Q<!eoe@*Hspod2X_dk2s*PML!NO-H1eFvm!e%Rs>>3i
zJt<z$xoic@0yK;rda~U*L7_I!DyT&|ac@?E4^U?Vd+ij(wVT`s$*p<q3hMEG?g4Xy
zu$ShWaqwPbD_XcsJWjYrF9bGsXToUHUT!6X9U_tw8eG#;d<6lA^aehv-RDS)n@1vJ
zoJzT)JfVg}#@e%bD#1iwqSySvG_cpl$DSr=sDMn;rl<k*D1Yv&e2NM1c5iUss{BX_
zc~Xh+Oh;PF9S+|7VcOtl^?jwuJChW`TPgsVa|88(|5l*ukNs(%dLAbp1Gnc;v)6w5
z`E(z&Adbg)p<NZ3;gOLMm+2>H=z9XVAyA!uRrUyaaKJkuBGDpar$>U#I+Rk>+$&k~
zK&;!lf+Zyz{<15G0=L&7ixo3R_GOSqbfX1?Bd)sGfwWQNSY@B})nTMtN%yH^o@O-8
z>v;7TZ&MWC-_iZ@m_ZRS)h|S&X^6a6Iw2;{yMX68;vDyB|K0SP>~e`(vD%J0@sNGP
z&@o6t)+5=nu$wzSjzwrL=;Ux)12_eq==a*N!o;k}q30m?oGQGVH|tD9I=x2~<ac*>
z8<_+Rug#=GzYW1vL!_Ck1Tx*;E&m`yhb3LN7iT}L9#ShYFrM1MJZ$Y`oj|%tF_fPk
zA8eui5NP#pWRe|FYgc^y{O&<SK4*v&-|?R9wB;?OksYY|d3YGSm3CJxM7I*r*_S5v
zva3rQy-XV=oT(UhOJ8#YsTe<5H>jhd(?nWbWwyq~ka8pDFmw82VlkmX8-#!&0kM0^
zqdzHSgAZn(vJ4W5`*PiTrIk64Y+^NRZEPMsJNW(b_N$J&xoTyx8n5`|{l?m!8flFQ
zmQbip93CE)4~6enf3AW#g@@aRT$OC)n59-=!q(X)HWm~X(xRbJ&_&hLz0v;LjXOEN
z8`$#*l&0eBCxN#%%?!dCF^QMN|FmrmVS@zYXK<ZLq%T#lY8<ZXJCT%GpwG;&B&#QJ
zWzrLyt>hQ=7oVKMPIzLL@D)jMI6Z%cJ>E%g3w?gQ&YioP9;a|u;+mzacpe<maS+yX
za2hO$aaTv}xo$mH+s!E7T<rzdD<~*95(+<bd^h;$G~FS5GVJ{H;Q1Xb%W6#@F-jDZ
z)ep;rwxh96SXR%|^V?AZQz0Sdbpe{6W1^>7zYWXGJe?2oQ@&T+TcLF0#(2Q5@0GVz
zhB}1K{?Klm{N24Rt?gO?$aW_rRZ8KvWPo5kLX;29G?xI~cyke17_qff;I?n!KmKUC
z?z)P~OaQ1cnyGqdwS$>}|D9@Tph`Dl32?1=&})>`Z$`Q3S2UnY)68s2_ms6nS)C4k
z&#ES?9sM*CP5m*XvdcIP)Th{&m?lQrM_-79E;_Y3AbB-j;1vJPJ)v}vBqRWOACWdu
zb{rB9!7>qcFe_#>s<7;N@09ry)(lN!sMd&v-jDk5PSiz;8oNG)N&A7l+-sRGiiXae
zoT#wqvu3(zLzt{M2%ldLURCynLF&g6+a}K)#vki9Qmz;Y<Jhmab6?6Ziaq-ir>-!v
zRzv@@@&!9V5m9@=$fDh8o2dfpGU>_r#!M@J*ni=DT3Xs^vdRu*@KN>2*nNi}m-CKy
zdaS&q>(NaDJk(qGW9b7G7AGgC4`pR#ur<)VHa#B7$tlc1twTxtjdsMQ(7*o1A0Vy0
zb|mZ&smtS2D^@-1C{P+>K&PmHmAB>R;aLk`FDhgfQ1*AGZ}$eMAb~YjrS+vHKZ!z{
zmFo`l3k(bllk$&=%f_Qg5zCi^+<e^J@>YV&^)5gBHCbIqO4Sw2c+s<T;^A;?(-5m;
z`2jrrY4nP2{_vN8A=P?D<XGM2%$F}lKBB3z60Ky4o;t4^%F2@wAn?(5$bL3M-(!-1
zM~?x50}6wTkvO5#pSs~i7EOnp7w^V{hJ0|9jjn{h0X85?%ghhPS@Q?2pTfx{1_|O;
zHlRw6HL}8$oM6ew42grx`IGKzoQW|q;oFJw$NQVp7`@BC{BiMXYik>3op&RS%mYF~
zcpzFc3Hq$Jf_-2W#K&?O)rBV6sIAGzxu>HU@{iT@3P-&gDOz2uoxuQPYgkt(`*c}M
zU0E3fPD!dGXB;JJvyzue+5wfK2pA3w49pFIK?qzlwS72W_b(xu_TVxbUA~b-)aG1k
z^YP*KQXGKv@*1>x@ZiFD{kG2=(f*Mp1;k4#D+<ErLl<R>vhefcd718q*C8T@U%q@n
zH2O+NEPk(aisSFe6En#&eJIhR{z&_9%1M#S0{*B5HRACg&3>5|XORV3HXHm7B+qu+
z&Me_)*x^Fl<Hc>I^ZxsIxTb#x76(efsXZoz>z<)pQ~+}~H~#OS&ruAVBI&xEs;Vkm
za!;8Y4$|Z^k3YMl`^wj#XnSw;ZrY{+s9N3EYsUsKIVJ2LY4Eh|&(8jmtgohR=LRp*
zfpSw$0eN~&k2M-nJQEDsQ&OA2ztVdfS(KwSk<ANiJZ(G97H6k-_V)fw3_IRu0>$Sc
zWrlX-zMR(g)!}R>eYGo*3&XC_pDGG6!bNnsF#$1T@&|~=U@(h(J}nxa)10~IC#3VR
z^Rv_Zm2Nw%OX`akFYrA=5m~FdA!kz_pD@cbOyscoHyn8c_eiKAXQL%q@8#FLJ5v4s
z%-Px7ziK;NOpIMp8b3XlPtM557%tOe&Ck!D4G0K`<90gSPLA*d7wSdMwQzu2x7?C8
zcw)k!f%7iEqMF{%Y%C=W{MicIdUl!Z1$S1!7b5Yu$z?WA1~aXpf59SdNokL7{xJ6b
zE6^nuM^t>=I=&I*?IZx{*U`b%|IxgT<w=M!cr!9nk0+N&m2XJ<60;{KCv(Qf$Nd-n
z#e~ggATTv9DTRiIhv%~sR<^{w-+-JTvv6*QsmCJkKGZ?Qmoom-fxH(|?F8@>8#N%?
zZM)f9A4b;pE&!?ETH{zOr&T%obwx!*-yzil2wV@5fZVBvdcO85Arv1-2$M<?uwsKd
zc(hnD`K91Oh6o)KhE4>{6nO@!@-`NWwE_`Mw0=JPSxswewx@Q2FgnGoXgTb3!{NS0
zi#z95Y!s@T;0{!KWil}{*QxJ+cgn}QTw&_q7DYD{Kk)rt9TOGStz556x;J@Lt_@kp
zQVDte^vRPQ1g!i0u&Z^OrWNO}w)3-N{ae{r+fFxq`W6@8OQDe>4>nM0tu!7a=V+E(
zX11uJA_*r?&r(CkFspmdfn#poqu0gtqS~gKQQzx~VFObm$ym&VWBi{O8R$fi;ir}z
zgGY{z8pize2rl2+o+&zk;;e#YtPATv)q25|+)~(g`I|SN#+#wY&GV<;oCM-F4F0){
z*i(GX!gzQ^4HPF86;*5Q*<RuKW?q~iZ|cRwhAfO6U=eNk;1b_I#hq8bqh6erPJ1_d
z4Rv;Eu|zGmE5WDx6%e)CW;cIT6}<6RFcteWm~>sIsj2C`fPg?Y<X!n~HrQsRJO9U$
zwcx&ku!&ujIck!Q(de(7j10H5jvr*AGjHh>LMdIczOD}2j3T?I2F(4r&Lx7r-fgr}
z^lh5Aly{I?6X_!Jpeb;3u`6-y5l~_(eh4~o%i?qLqik??ByPm63NQoxl#NQj>X+#p
z5{7q<BS0Edsk4Q!GN&=36Xr5PO6+cq-S_6FJ{y1j_>%CT={*Sy)Z%es3h}>b`)wRK
zMkCpqCmV-kn21TYNA(d&yZfn^bj>t1HBVnH)$qnTvcg?mLkf=6O~cb+TqdxA_h5#j
zkgDgoanrTJeWNm-df?<oG|M4_OiN0{LJSvi{@GS*hq<|V7#Ldmb;uftP@9t%N|-Pw
z(yJl%ox3frav4T5A*5{L^74lwf;(e_1>THzgQ1QG-a9sbes;hRak3<2%h(am3O5o#
z_m5m2LmQ$b3?YsI#IzjJ74@UxWaiDu>c@AY#}Kch#iD~T9m{kgJ4F`mS1<+=&+p*`
z?vL8W1Qc7y@0RkHPeVkerSYKtpZ@Y)g86Z1ysMm=BDyQsiXpa6IMdr`!7$?f`{HUE
zkH-||M^@LV*|j&Fh0UWZ;ik~bh7v&oeRvQ|xDf5AT!L@Wui|ct%wU-L8MEZ$Qf-5x
zLV|l}L#Oe>T$|@zxI&mggQ|6;R`l41_A$!hL9?fl`==;<T`HJq%!w=*!xg`!G0gmb
zy1|6~FM098{!3E|i2qWJTgCs;DAMhJNHLgB(~Hc2{hF?AizBe{N_&k_CVEuVSW=eq
z8E9XGpP1S*c}>+_z`E0J(20Dz;Q@A-uq@Wm{2FfANrKF^mi<l~tQP#%*VyUrS511F
ze-oLgt0pwB8|2WY+<LbEYscaIXkwu2;qYj>-n7*hNZ0)<%GCC%Av?>*v$M13@@i^x
z?%X<Yj@&g__MfL}cn~rzHgMD6ptUa<^7{iaZTxqyrmccl$MPyUdCT3$r(V%+s-J=Z
zA!Gek*Yx6O@F{s>bHX8F_IM;6U*q2+@RTtyFtCO}gkJ>xoXng<Mi!eWFJ<xJw=xUd
zx@l->LFb$g2C!9KL!PUJ@t*$WA8e2zY^4=-n2g-qHtK(<?&!*8cseFo7jt;3+JzF8
zDei>MCm-Rr?3$mHk<D|DEas_LR4Pi^+SKdDZq(jvq#LA}ctpA?$%IYm$fI9XRaTIu
za;1RUg4iJZ(UylM@f+d7Lx63E;wR?9b{d4f{<ZB1qolenro)P?oLL~hew9>8l%Hu$
zv|@v47rS$oNjvKsKqaUZdk3KivYef`@D$Y5w^KIBzWeR7k~_WdqXLy4@u-4VIHtK~
zo;di$J4QJH)RBYAH<#lru2+1n#8SfeP*Gz{&Ow}U;xeNWjulKDdVT9{4VD#f)2_<7
z)Y<Nrr@rr4VL?RZNC;`>V@(hJGwD}+>8Kf|4hPjPLHd*Uz491;sdIm#@!B?u!j9^z
zG%o#N+A~<t>_Z?H*hA%{f26j%c^vt2O+H+JvX-?piaJjVa<8_(>spk{U;Ml@!3<?@
z(w#Bba?}nD?2PXX*n0BdroC~+jZA^~TM?9&8sYeuUr9g3)V5zdh;>xLx&+C0C%hSX
zeZoJCme&k2c@scXBE^zI=q7@eE?&IYhk!k@x>%|cuwlFZ@xg-!sZKqw$Yus<RV%bI
zJxhuTj&i1?EWWIOOPq-r(b3VorI{g9{#JBN&CS+NpFU-ulDuW<bK_$ms+Oi?Cx?De
z%5{7<=sYg)$&|AgiQ<n0?pAA)6@_<7fB8sx`6r97S3~{3>AP3BQ)8j;KM1ZrqLOOi
zxBTKP*JvS$VTJ#kIbG+~{i>q+k~|)$2AE`07xPUmNJ~o>5OdWdtRZ>w$P#D#Rw53E
zJDHlAszOV}-Lc!x>~bplXIS$e{Nr;lC4$MoU@dJmH8tx^<$`P_$QXFu-fE_gbPIXh
z))0avRP7M<DSXEnJ3?JW;S~SgWymrD@ytw2wcQUZAtG9Z_wV<buk8LE!ARYgKK=Dr
z{WdvT=;Q~O>T>~h+7;|pfbcsF;T1OVmCAC8h7&Mz&ulv*e>#^>>wBZNUzsfM_U+rB
z0sK8^X;f92M{7;Zn~2@Pn_Tu`<gxSc70ms!dIU_G5|Qd>r7_1c2kU<ptf|M`zCJa@
zdpl_TO=VTpV!`NI8w(4|!S}jZ6Nw-+G}fqWJY^RCQRK=6p?2`tQ#-akt+jiLi86Qx
z7^gbm%cFs}w^y6tk8~|yDB0<PQ8#M)0s7R|IIkU7?G(|f>kL-Y>Z!iqwFdMv#@@~N
z75#lyXD)}dEs|z6eAvh%Mp92kA7OzC(rI$1)iBE}B1p2pB&LHA^WU;k<0uXEnI<?6
zAGLg3m<eLg;B?hG^Xfm~8Q-0$4O6m{ywZnZ@xIq>e&uftS5&bZfu5@1h7CGd)>M)>
z;*luCoKE?L<$3o_%38nTxi7xMP$O!~Dcu7ZN-HH7ft%6vz?sl(;US8lp>OHn<tw1C
LZK72UM@IbzTdCK6

literal 0
HcmV?d00001

diff --git a/PasteIntoFile/Resources/icon44.png b/PasteIntoFile/Resources/icon44.png
new file mode 100644
index 0000000000000000000000000000000000000000..330ff96f0a00bd45f21ecccae977b4b8508e6b8c
GIT binary patch
literal 1444
zcmV;V1zY-wP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0olnc
ze*gdg1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF*
zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007
zbV*G`2kHk96)Y5>G{=Jg00ihsL_t(o!|hpJXcSi%J$LTRj{7%GreG5_X{2njsFVm1
z@=&naKooqa2<bw=(#NC}+$D%4s}Ri^Bo7h<`&6|0(AOpuX#;&|=u2s+$wMC!ipG{C
z8}s8PE4!Q7nS1+?*)omm#&Q2r@W8y>WoHiO`@Zvi_g;c6hyeTmd;ll_g7Sa^FaW#&
zkOW{leE|U=DvA=gdiCnLrlzJA(=_*>jG&aJ9zA;WYb+KU)ph;pn~<&<9v<#XrBW$g
zAtVxs_1@mz9xI}bAOP?+H#Z-1yWMV72#TWk+uGWW0&u?xVbL^A85IQCf^2=?QN4(T
zeq3H&*5~Ht9=lwwbwUVtR9&14x~|s*0)a!Ss*10uAIB(2cx7cJar*S>+iPoUzggAo
z1X5E|(~0r%@u;e*N~xk#kT7G6y4~(~_V3?cM+h+;DlAe;RnECk%5*A7xUsQOot&Hu
z3xcpoh_eWC&Iw~oR#nwgF~VN2mwLV4nzD2d&WTlYj$NWEFbrcKfOoCVy88*Yx3_=T
z-{1c!A>`0bk^WDo1W*$Sh0X+n!RAU5_INyUOH0d9Ns_V?6BBa)HUO}qa@Z+WS65S}
zX(kCFERW+z9*<|Q-|v@lYnrC1;c&Qz5Q4$M!F!zZ$2-jyB_%vMI{HgrU*9*B(u6gc
z{hNB(Z1%l}4<CNn+S(el|3}j__2R{gJ&ZBLVzIjb<_dYfSmH1*EG;cf0C={YFo44@
zm+OMfC6Kd9P1Dp!B+?@Y0<K@beiy)#S1Dam!d5C|t!F!7!`|NK=jTnvn9<PCAlsDg
z=A2`2aPXB%SJT$g0|Ns;EiNvu*wUjW91izHqtVX+H0BeuYJ>$r$WBg9{&@4|&D-&K
z{Moib?7nj4N?y`pwFnbJxGc*{BO@a}2!gPA>C&Z0ZEfwooYJ{Mym8~kJ<j=)TzXVZ
zVE}|NCIWbV>(;HYp`oF#78Vv(?Mg=?k)CKY`kAFPt*XL|F*y(je0=1{ky-#e9*^%C
z9v+_U?d?5&;J^XVR)}A4&Jl~nzUG|&RY}6!?i}^?^_~Y09$c`man1!n5QObM9S(=P
zlgZ@YBO@c<Rx%|F#+Ys^I*6i3MH?hZ5-5Fn7Sc3LYj1Bq0bs9CL3I;TQ&Ur$o0~dg
zj5Eft(_@EenqB~sSV6*TmoHzwH$OkWcJScAX2zIQAiqUj*BiUKx<2sx{WRAZD_wMY
zJRbj}zrX(}0PhZ)P|wMeCp$x-(BbX#a;04&3*fo+6oSv?awYQZ)T`;kuk9%R2g18=
zi}aT8Tf!wI%=2v;cQfI%VHnFi*GhIdL;%VA_wRon3<g{3>gwKiaCk>J=dz}0^0ons
zl$&sRY;5f3@$vBmpU>Ao2zjkL4%0N<XV0GPxO3;uIj`4Cb7v0#JXY&1CSqR3n4B-@
zqV?kSOeXVtCX<<VppfG8`RW0Dl3PfnQh`&aPK6{%+9*av(==tb+ufG$+)cE#LKDtz
zbaYB-*1pi$*?Ii@`SZt|p4PwAm$#IqilRuiJz&wp4+F4i54|-C(z3XNAY=d-#rSY`
zdU|?heSJM%Zi7ju)9KmS*(m@oim7Nq2&wJv?mpAe(eV-IT(J(ROL-IkN@-?hW@hTz
ywQJvPY;62l><0wP5flKfGFh5|t!v&S0OKFAgkPyM%(-*`0000<MNUMnLSTaR*r4A4

literal 0
HcmV?d00001

diff --git a/PasteIntoFile/Wizard.Designer.cs b/PasteIntoFile/Wizard.Designer.cs
index 9c2a75f..275a55c 100644
--- a/PasteIntoFile/Wizard.Designer.cs
+++ b/PasteIntoFile/Wizard.Designer.cs
@@ -46,6 +46,7 @@ private void InitializeComponent() {
             this.contextEntryCheckBoxPaste = new System.Windows.Forms.CheckBox();
             this.contextEntryCheckBoxCopy = new System.Windows.Forms.CheckBox();
             this.contextEntryCheckBoxReplace = new System.Windows.Forms.CheckBox();
+            this.contextEntryCheckBoxWin11 = new System.Windows.Forms.CheckBox();
             this.finish = new System.Windows.Forms.Button();
             this.version = new System.Windows.Forms.LinkLabel();
             this.tableLayoutPanel1.SuspendLayout();
@@ -65,21 +66,22 @@ private void InitializeComponent() {
             this.tableLayoutPanel1.Controls.Add(this.contextEntryCheckBoxPaste, 0, 4);
             this.tableLayoutPanel1.Controls.Add(this.contextEntryCheckBoxCopy, 0, 5);
             this.tableLayoutPanel1.Controls.Add(this.contextEntryCheckBoxReplace, 0, 6);
-            this.tableLayoutPanel1.Controls.Add(this.autoSaveTitleLabel, 0, 7);
-            this.tableLayoutPanel1.Controls.Add(this.autoSaveInfoLabel, 0, 8);
-            this.tableLayoutPanel1.Controls.Add(this.autoSaveCheckBox, 0, 9);
-            this.tableLayoutPanel1.Controls.Add(this.autoSaveMayOpenNewCheckBox, 0, 10);
-            this.tableLayoutPanel1.Controls.Add(this.autostartTitleLabel, 0, 11);
-            this.tableLayoutPanel1.Controls.Add(this.autostartInfoLabel, 0, 12);
-            this.tableLayoutPanel1.Controls.Add(this.autostartCheckBox, 0, 13);
-            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 14);
-            this.tableLayoutPanel1.Controls.Add(this.finish, 0, 15);
+            this.tableLayoutPanel1.Controls.Add(this.contextEntryCheckBoxWin11, 0, 7);
+            this.tableLayoutPanel1.Controls.Add(this.autoSaveTitleLabel, 0, 8);
+            this.tableLayoutPanel1.Controls.Add(this.autoSaveInfoLabel, 0, 9);
+            this.tableLayoutPanel1.Controls.Add(this.autoSaveCheckBox, 0, 10);
+            this.tableLayoutPanel1.Controls.Add(this.autoSaveMayOpenNewCheckBox, 0, 11);
+            this.tableLayoutPanel1.Controls.Add(this.autostartTitleLabel, 0, 12);
+            this.tableLayoutPanel1.Controls.Add(this.autostartInfoLabel, 0, 13);
+            this.tableLayoutPanel1.Controls.Add(this.autostartCheckBox, 0, 14);
+            this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel2, 0, 15);
+            this.tableLayoutPanel1.Controls.Add(this.finish, 0, 16);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
             this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(4);
-            this.tableLayoutPanel1.RowCount = 17;
+            this.tableLayoutPanel1.RowCount = 18;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
@@ -104,7 +106,7 @@ private void InitializeComponent() {
             this.tableLayoutPanel2.AutoScroll = true;
             this.tableLayoutPanel2.AutoSizeMode = AutoSizeMode.GrowAndShrink;
             this.tableLayoutPanel2.RowCount = 1;
-            this.tableLayoutPanel2.ColumnCount = 3;
+            this.tableLayoutPanel2.ColumnCount = 2;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
@@ -126,7 +128,7 @@ private void InitializeComponent() {
             this.autoSaveCheckBox.Margin = new System.Windows.Forms.Padding(9, 9, 9, 0);
             this.autoSaveCheckBox.Name = "autoSaveCheckBox";
             this.autoSaveCheckBox.Size = new System.Drawing.Size(262, 24);
-            this.autoSaveCheckBox.TabIndex = 4;
+            this.autoSaveCheckBox.TabIndex = 5;
             this.autoSaveCheckBox.Text = Resources.str_wizard_autosave_button;
             this.autoSaveCheckBox.UseVisualStyleBackColor = true;
             this.autoSaveCheckBox.CheckedChanged += new System.EventHandler(this.ChkAutoSave_CheckedChanged);
@@ -140,7 +142,7 @@ private void InitializeComponent() {
             this.autoSaveMayOpenNewCheckBox.Margin = new System.Windows.Forms.Padding(9, 0, 9, 9);
             this.autoSaveMayOpenNewCheckBox.Name = "autoSaveMayOpenNewCheckBox";
             this.autoSaveMayOpenNewCheckBox.Size = new System.Drawing.Size(288, 24);
-            this.autoSaveMayOpenNewCheckBox.TabIndex = 5;
+            this.autoSaveMayOpenNewCheckBox.TabIndex = 6;
             this.autoSaveMayOpenNewCheckBox.Text = Resources.str_wizard_autosave_may_open_new_explorer;
             this.autoSaveMayOpenNewCheckBox.UseVisualStyleBackColor = true;
             this.autoSaveMayOpenNewCheckBox.CheckedChanged += new System.EventHandler(this.ChkAutoSaveMayOpenNew_CheckedChanged);
@@ -242,6 +244,20 @@ private void InitializeComponent() {
             this.contextEntryCheckBoxReplace.UseVisualStyleBackColor = true;
             this.contextEntryCheckBoxReplace.CheckedChanged += new System.EventHandler(this.ChkContextEntry_CheckedChanged);
             //
+            // contextEntryCheckBoxWin11
+            //
+            this.contextEntryCheckBoxWin11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
+            this.contextEntryCheckBoxWin11.AutoSize = true;
+            this.contextEntryCheckBoxWin11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.contextEntryCheckBoxWin11.Location = new System.Drawing.Point(275, 192);
+            this.contextEntryCheckBoxWin11.Margin = new System.Windows.Forms.Padding(9, 0, 9, 9);
+            this.contextEntryCheckBoxWin11.Name = "contextEntryCheckBoxWin11";
+            this.contextEntryCheckBoxWin11.Size = new System.Drawing.Size(288, 24);
+            this.contextEntryCheckBoxWin11.TabIndex = 4;
+            this.contextEntryCheckBoxWin11.Text = Resources.str_contextentry_win11;
+            this.contextEntryCheckBoxWin11.UseVisualStyleBackColor = true;
+            this.contextEntryCheckBoxWin11.CheckedChanged += new System.EventHandler(this.ChkContextEntry_CheckedChanged);
+            //
             // autostartTitleLabel
             //
             this.autostartTitleLabel.AutoSize = true;
@@ -272,7 +288,7 @@ private void InitializeComponent() {
             this.autostartCheckBox.Margin = new System.Windows.Forms.Padding(9, 9, 9, 0);
             this.autostartCheckBox.Name = "autostartCheckBox";
             this.autostartCheckBox.Size = new System.Drawing.Size(288, 24);
-            this.autostartCheckBox.TabIndex = 5;
+            this.autostartCheckBox.TabIndex = 7;
             this.autostartCheckBox.Text = Resources.str_wizard_tray_autostart_button;
             this.autostartCheckBox.UseVisualStyleBackColor = true;
             this.autostartCheckBox.CheckedChanged += new System.EventHandler(this.ChkAutostart_CheckedChanged);
@@ -286,7 +302,7 @@ private void InitializeComponent() {
             this.patchingCheckBox.Margin = new System.Windows.Forms.Padding(9, 0, 5, 9);
             this.patchingCheckBox.Name = "patchingCheckBox";
             this.patchingCheckBox.Size = new System.Drawing.Size(210, 17);
-            this.patchingCheckBox.TabIndex = 6;
+            this.patchingCheckBox.TabIndex = 8;
             this.patchingCheckBox.Text = Resources.str_wizard_tray_patching_button;
             this.patchingCheckBox.UseVisualStyleBackColor = true;
             this.patchingCheckBox.CheckedChanged += new System.EventHandler(this.ChkPatching_CheckedChanged);
@@ -300,7 +316,7 @@ private void InitializeComponent() {
             this.patchingCheckBoxImg.Margin = new System.Windows.Forms.Padding(0, 0, 5, 9);
             this.patchingCheckBoxImg.Name = "patchingCheckBoxImg";
             this.patchingCheckBoxImg.Size = new System.Drawing.Size(210, 17);
-            this.patchingCheckBoxImg.TabIndex = 7;
+            this.patchingCheckBoxImg.TabIndex = 9;
             this.patchingCheckBoxImg.Text = Resources.str_wizard_tray_patching_img_only;
             this.patchingCheckBoxImg.UseVisualStyleBackColor = true;
             this.patchingCheckBoxImg.CheckedChanged += new System.EventHandler(this.ChkPatchingImg_CheckedChanged);
@@ -313,7 +329,7 @@ private void InitializeComponent() {
             this.finish.Margin = new System.Windows.Forms.Padding(4, 30, 4, 15);
             this.finish.Name = "finish";
             this.finish.Size = new System.Drawing.Size(206, 30);
-            this.finish.TabIndex = 9;
+            this.finish.TabIndex = 10;
             this.finish.Text = Resources.str_wizard_finish;
             this.finish.UseVisualStyleBackColor = true;
             this.finish.Click += new System.EventHandler(this.finish_Click);
@@ -326,7 +342,7 @@ private void InitializeComponent() {
             this.version.Location = new System.Drawing.Point(258, 66);
             this.version.Name = "version";
             this.version.Size = new System.Drawing.Size(59, 20);
-            this.version.TabIndex = 9;
+            this.version.TabIndex = 12;
             this.version.Text = "version";
             this.version.LinkColor = Color.DodgerBlue;
             this.version.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -358,7 +374,7 @@ private void InitializeComponent() {
             this.settingsButton.Location = new Point(0, 4);
             this.settingsButton.Margin = new Padding(0);
             this.settingsButton.Name = "settings";
-            this.settingsButton.TabIndex = 8;
+            this.settingsButton.TabIndex = 10;
             this.settingsButton.AutoSize = true;
             this.settingsButton.Cursor = Cursors.Hand;
             this.settingsButton.Click += new EventHandler(this.settingsButton_Click);
@@ -372,7 +388,7 @@ private void InitializeComponent() {
             this.Controls.Add(this.tableLayoutPanel1);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(700, 900);
+            this.MinimumSize = new System.Drawing.Size(700, 950);
             this.Name = "Wizard";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Shown += new System.EventHandler(this.Wizard_Shown);
@@ -396,6 +412,7 @@ private void InitializeComponent() {
         private System.Windows.Forms.CheckBox contextEntryCheckBoxPaste;
         private System.Windows.Forms.CheckBox contextEntryCheckBoxCopy;
         private System.Windows.Forms.CheckBox contextEntryCheckBoxReplace;
+        private System.Windows.Forms.CheckBox contextEntryCheckBoxWin11;
         private System.Windows.Forms.Label autoSaveTitleLabel;
         private System.Windows.Forms.Label contextEntryInfoLabel;
         private System.Windows.Forms.Label title;
diff --git a/PasteIntoFile/Wizard.cs b/PasteIntoFile/Wizard.cs
index c4a559a..f0a8586 100644
--- a/PasteIntoFile/Wizard.cs
+++ b/PasteIntoFile/Wizard.cs
@@ -31,6 +31,7 @@ private void ReloadUi() {
             contextEntryCheckBoxPaste.Checked = RegistryUtil.ContextMenuPaste.IsRegistered();
             contextEntryCheckBoxCopy.Checked = RegistryUtil.ContextMenuCopy.IsRegistered();
             contextEntryCheckBoxReplace.Checked = RegistryUtil.ContextMenuReplace.IsRegistered();
+            contextEntryCheckBoxWin11.Checked = ExplorerUtil.IsWin11ContextMenuRegistered();
             autostartCheckBox.Checked = RegistryUtil.IsAutostartRegistered();
             patchingCheckBox.Checked = Settings.Default.trayPatchingEnabled;
             patchingCheckBox.Enabled = autostartCheckBox.Checked;
@@ -123,29 +124,60 @@ private void ChkAutoSaveMayOpenNew_CheckedChanged(object sender, EventArgs e) {
         }
 
 
-        private void ChkContextEntry_CheckedChanged(object sender, EventArgs e) {
+        private async void ChkContextEntry_CheckedChanged(object sender, EventArgs e) {
             var checkBox = sender as CheckBox;
-            RegistryUtil.ContextMenuEntry entry;
-            if (sender == contextEntryCheckBoxPaste) {
-                entry = RegistryUtil.ContextMenuPaste;
-            } else if (sender == contextEntryCheckBoxCopy) {
-                entry = RegistryUtil.ContextMenuCopy;
-            } else if (sender == contextEntryCheckBoxReplace) {
-                entry = RegistryUtil.ContextMenuReplace;
-            } else {
-                return;
-            }
+            var desiredState = checkBox.Checked;
+            Cursor = Cursors.WaitCursor;
+
             try {
-                if (checkBox.Checked && !entry.IsRegistered()) {
-                    entry.Register();
-                    SavedAnimation(checkBox);
-                } else if (!checkBox.Checked && entry.IsRegistered()) {
-                    entry.UnRegister();
+                bool changed;
+                if (sender == contextEntryCheckBoxWin11) {
+                    changed = await Task.Run(() => {
+                        var isRegistered = ExplorerUtil.IsWin11ContextMenuRegistered();
+
+                        if (desiredState && !isRegistered) {
+                            ExplorerUtil.RegisterWin11ContextMenu();
+                            return true;
+                        } else if (!desiredState && isRegistered) {
+                            ExplorerUtil.UnregisterWin11ContextMenu();
+                            return true;
+                        }
+                        return false;
+                    });
+                } else {
+                    RegistryUtil.ContextMenuEntry entry;
+                    if (sender == contextEntryCheckBoxPaste) {
+                        entry = RegistryUtil.ContextMenuPaste;
+                    } else if (sender == contextEntryCheckBoxCopy) {
+                        entry = RegistryUtil.ContextMenuCopy;
+                    } else if (sender == contextEntryCheckBoxReplace) {
+                        entry = RegistryUtil.ContextMenuReplace;
+                    } else {
+                        return;
+                    }
+                    changed = await Task.Run(() => {
+                        if (desiredState && !entry.IsRegistered()) {
+                            entry.Register();
+                            return true;
+                        } else if (!desiredState && entry.IsRegistered()) {
+                            entry.UnRegister();
+                            return true;
+                        }
+                        return false;
+                    });
+                }
+
+                if (changed) {
                     SavedAnimation(checkBox);
                 }
+
             } catch (Exception ex) {
                 MessageBox.Show(ex.Message + "\n" + Resources.str_message_run_as_admin, Resources.app_title, MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+            } finally {
+                Cursor = Cursors.Default;
             }
+
         }
 
         private void SavedAnimation(Control control) {
diff --git a/PasteIntoFileShellExtension/AppxManifest.xml b/PasteIntoFileShellExtension/AppxManifest.xml
new file mode 100644
index 0000000..efe2ad0
--- /dev/null
+++ b/PasteIntoFileShellExtension/AppxManifest.xml
@@ -0,0 +1,40 @@
+<?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:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5" xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap uap10 desktop4 desktop5 com rescap">
+    <Identity Name="PasteIntoFile.Dev.ShellExtension" Publisher="CN=PasteIntoFile Dev" Version="1.0.0.0" />
+    <Properties>
+        <DisplayName>PasteIntoFile</DisplayName>
+        <PublisherDisplayName>PasteIntoFile Dev</PublisherDisplayName>
+        <Logo>icon.png</Logo>
+        <uap10:AllowExternalContent>true</uap10:AllowExternalContent>
+    </Properties>
+    <Dependencies>
+        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.22000.0" MaxVersionTested="10.0.26100.0" />
+    </Dependencies>
+    <Applications>
+        <Application Id="PasteIntoFile" Executable="PasteIntoFile.exe" uap10:RuntimeBehavior="win32App" uap10:TrustLevel="mediumIL">
+            <uap:VisualElements DisplayName="PasteIntoFile" Description="PasteIntoFile" BackgroundColor="transparent" Square150x150Logo="icon150.png" Square44x44Logo="icon44.png" />
+            <Extensions>
+                <com:Extension Category="windows.comServer">
+                    <com:ComServer>
+                        <com:SurrogateServer DisplayName="PasteIntoFile Shell Extension">
+                            <com:Class Id="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
+                        </com:SurrogateServer>
+                    </com:ComServer>
+                </com:Extension>
+                <desktop4:Extension Category="windows.fileExplorerContextMenus">
+                    <desktop4:FileExplorerContextMenus>
+                        <desktop5:ItemType Type="Directory">
+                            <desktop5:Verb Id="PasteIntoFilePasteDirectory" Clsid="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" />
+                        </desktop5:ItemType>
+                        <desktop5:ItemType Type="Directory\Background">
+                            <desktop5:Verb Id="PasteIntoFilePasteDirectoryBackground" Clsid="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" />
+                        </desktop5:ItemType>
+                    </desktop4:FileExplorerContextMenus>
+                </desktop4:Extension>
+            </Extensions>
+        </Application>
+    </Applications>
+    <Capabilities>
+        <rescap:Capability Name="runFullTrust" />
+    </Capabilities>
+</Package>
diff --git a/PasteIntoFileShellExtension/Command.cs b/PasteIntoFileShellExtension/Command.cs
new file mode 100644
index 0000000..cda4ff1
--- /dev/null
+++ b/PasteIntoFileShellExtension/Command.cs
@@ -0,0 +1,358 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace PasteIntoFileShellExtension;
+
+[ComVisible(true)]
+[Guid(Command.ClassId)]
+[ProgId("PasteIntoFile.ShellExtension.PasteCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class Command : IExplorerCommand {
+    public const string ClassId = "A6F24F95-0E3D-4A37-8E58-1F05D66E76A5";
+
+    private const int S_OK = 0;
+    private const int E_NOTIMPL = unchecked((int)0x80004001);
+    private const int E_FAIL = unchecked((int)0x80004005);
+
+
+    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        var title = "PasteIntoFile";
+        ppszName = Marshal.StringToCoTaskMemUni(title);
+        return S_OK;
+
+    }
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        var exePath = GetPasteIntoFileExecutablePath();
+
+        if (!string.IsNullOrWhiteSpace(exePath) && File.Exists(exePath)) {
+            ppszIcon = Marshal.StringToCoTaskMemUni(exePath + ",0");
+            return S_OK;
+        }
+
+        ppszIcon = IntPtr.Zero;
+        return E_NOTIMPL;
+    }
+
+    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
+        ppszInfotip = IntPtr.Zero;
+        return E_NOTIMPL;
+    }
+
+    public int GetCanonicalName(out Guid pguidCommandName) {
+        pguidCommandName = new Guid(ClassId);
+        return S_OK;
+    }
+
+    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = EXPCMDSTATE.ECS_ENABLED;
+        return S_OK;
+    }
+
+    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        try {
+            var exePath = GetPasteIntoFileExecutablePath();
+
+            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
+                return E_FAIL;
+            }
+
+            var targetFolder = TryGetTargetFolderPath(psiItemArray);
+
+            var startInfo = new ProcessStartInfo {
+                FileName = exePath,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            startInfo.ArgumentList.Add("paste");
+
+            if (!string.IsNullOrWhiteSpace(targetFolder)) {
+                startInfo.ArgumentList.Add(targetFolder);
+            }
+
+            Process.Start(startInfo);
+            return S_OK;
+        } catch {
+            return E_FAIL;
+        }
+    }
+
+    public int GetFlags(out EXPCMDFLAGS pFlags) {
+        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
+        return S_OK;
+    }
+
+    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        ppEnum = null!;
+        return E_NOTIMPL;
+    }
+
+    private static string? TryGetTargetFolderPath(IShellItemArray? shellItemArray) {
+        if (shellItemArray == null) {
+            return null;
+        }
+
+        try {
+            if (shellItemArray.GetCount(out var count) != S_OK || count == 0) {
+                return null;
+            }
+
+            for (uint i = 0; i < count; i++) {
+                IShellItem? shellItem = null;
+
+                try {
+                    if (shellItemArray.GetItemAt(i, out shellItem) != S_OK || shellItem == null) {
+                        continue;
+                    }
+
+                    var path = TryGetFileSystemPath(shellItem);
+
+                    if (string.IsNullOrWhiteSpace(path)) {
+                        continue;
+                    }
+
+                    if (Directory.Exists(path)) {
+                        return path;
+                    }
+
+                    if (File.Exists(path)) {
+                        return Path.GetDirectoryName(path);
+                    }
+                } finally {
+                    if (shellItem != null) {
+                        Marshal.ReleaseComObject(shellItem);
+                    }
+                }
+            }
+        } catch {
+            return null;
+        }
+
+        return null;
+    }
+
+    private static string? TryGetFileSystemPath(IShellItem shellItem) {
+        IntPtr pathPtr = IntPtr.Zero;
+
+        try {
+            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out pathPtr) != S_OK || pathPtr == IntPtr.Zero) {
+                return null;
+            }
+
+            return Marshal.PtrToStringUni(pathPtr);
+        } catch {
+            return null;
+        } finally {
+            if (pathPtr != IntPtr.Zero) {
+                Marshal.FreeCoTaskMem(pathPtr);
+            }
+        }
+    }
+
+    private static string? GetPasteIntoFileExecutablePath() {
+        var extensionDirectory = Path.GetDirectoryName(typeof(Command).Assembly.Location);
+
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            extensionDirectory = AppContext.BaseDirectory;
+        }
+
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            return null;
+        }
+
+        return Path.Combine(extensionDirectory, "PasteIntoFile.exe");
+    }
+}
+
+[ComVisible(true)]
+[Guid("A08CE4D0-FA25-44AB-B57C-C7B1C323E0B9")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IExplorerCommand {
+    [PreserveSig]
+    int GetTitle(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszName
+    );
+
+    [PreserveSig]
+    int GetIcon(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszIcon
+    );
+
+    [PreserveSig]
+    int GetToolTip(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszInfotip
+    );
+
+    [PreserveSig]
+    int GetCanonicalName(out Guid pguidCommandName);
+
+    [PreserveSig]
+    int GetState(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        [MarshalAs(UnmanagedType.Bool)] bool fOkToBeSlow,
+        out EXPCMDSTATE pCmdState
+    );
+
+    [PreserveSig]
+    int Invoke(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        IntPtr pbc
+    );
+
+    [PreserveSig]
+    int GetFlags(out EXPCMDFLAGS pFlags);
+
+    [PreserveSig]
+    int EnumSubCommands(
+        [MarshalAs(UnmanagedType.Interface)] out IEnumExplorerCommand ppEnum
+    );
+}
+
+[ComImport]
+[Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IShellItemArray {
+    [PreserveSig]
+    int BindToHandler(
+        IntPtr pbc,
+        ref Guid bhid,
+        ref Guid riid,
+        out IntPtr ppvOut
+    );
+
+    [PreserveSig]
+    int GetPropertyStore(
+        GETPROPERTYSTOREFLAGS flags,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetPropertyDescriptionList(
+        ref PROPERTYKEY keyType,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetAttributes(
+        SIATTRIBFLAGS attribFlags,
+        uint sfgaoMask,
+        out uint psfgaoAttribs
+    );
+
+    [PreserveSig]
+    int GetCount(out uint pdwNumItems);
+
+    [PreserveSig]
+    int GetItemAt(
+        uint dwIndex,
+        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
+    );
+
+    [PreserveSig]
+    int EnumItems(out IntPtr ppenumShellItems);
+}
+
+[ComImport]
+[Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IShellItem {
+    [PreserveSig]
+    int BindToHandler(
+        IntPtr pbc,
+        ref Guid bhid,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetParent(
+        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
+    );
+
+    [PreserveSig]
+    int GetDisplayName(
+        SIGDN sigdnName,
+        out IntPtr ppszName
+    );
+
+    [PreserveSig]
+    int GetAttributes(
+        uint sfgaoMask,
+        out uint psfgaoAttribs
+    );
+
+    [PreserveSig]
+    int Compare(
+        [MarshalAs(UnmanagedType.Interface)] IShellItem psi,
+        uint hint,
+        out int piOrder
+    );
+}
+
+[ComImport]
+[Guid("A88826F8-186F-4987-AADE-EA0CEF8FBFE8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IEnumExplorerCommand {
+}
+
+public enum EXPCMDSTATE {
+    ECS_ENABLED = 0,
+    ECS_DISABLED = 1,
+    ECS_HIDDEN = 2,
+    ECS_CHECKBOX = 4,
+    ECS_CHECKED = 8,
+    ECS_RADIOCHECK = 16
+}
+
+[Flags]
+public enum EXPCMDFLAGS {
+    ECF_DEFAULT = 0,
+    ECF_HASSUBCOMMANDS = 1,
+    ECF_HASSPLITBUTTON = 2,
+    ECF_HIDELABEL = 4,
+    ECF_ISSEPARATOR = 8,
+    ECF_HASLUASHIELD = 16,
+    ECF_SEPARATORBEFORE = 32,
+    ECF_SEPARATORAFTER = 64,
+    ECF_ISDROPDOWN = 128,
+    ECF_TOGGLEABLE = 256,
+    ECF_AUTOMENUICONS = 512
+}
+
+public enum SIGDN : uint {
+    SIGDN_NORMALDISPLAY = 0x00000000,
+    SIGDN_PARENTRELATIVEPARSING = 0x80018001,
+    SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
+    SIGDN_PARENTRELATIVEEDITING = 0x80031001,
+    SIGDN_DESKTOPABSOLUTEEDITING = 0x8004C000,
+    SIGDN_FILESYSPATH = 0x80058000,
+    SIGDN_URL = 0x80068000,
+    SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007C001,
+    SIGDN_PARENTRELATIVE = 0x80080001,
+    SIGDN_PARENTRELATIVEFORUI = 0x80094001
+}
+
+public enum GETPROPERTYSTOREFLAGS {
+    GPS_DEFAULT = 0
+}
+
+public enum SIATTRIBFLAGS {
+    SIATTRIBFLAGS_AND = 1,
+    SIATTRIBFLAGS_OR = 2,
+    SIATTRIBFLAGS_APPCOMPAT = 3
+}
+
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+public struct PROPERTYKEY {
+    public Guid fmtid;
+    public uint pid;
+}
diff --git a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
new file mode 100644
index 0000000..6ed29d1
--- /dev/null
+++ b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net9.0-windows</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <!-- Erzeugt ShellExtension.comhost.dll für COM-Hosting -->
+        <EnableComHosting>true</EnableComHosting>
+        <!-- Explorer ist 64-bit, daher für den ersten Spike explizit x64 -->
+        <PlatformTarget>x64</PlatformTarget>
+        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+        <!-- Hilfreich für COM-Komponenten, die dynamisch geladen werden -->
+        <EnableDynamicLoading>true</EnableDynamicLoading>
+    </PropertyGroup>
+    <Target Name="CopyFiles" AfterTargets="Build">
+        <ItemGroup>
+            <Manifest Include="AppXManifest.xml" />
+            <Icon Include="../PasteIntoFile/Resources/icon*.png" />
+        </ItemGroup>
+        <Copy SourceFiles="@(Manifest)" DestinationFiles="@(Manifest-&gt;'$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+        <Copy SourceFiles="@(Icon)" DestinationFiles="@(Icon-&gt;'$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+    </Target>
+</Project>

From 1e3e5d61b773396a961b1c7e80e5fe319bbd603f Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Fri, 17 Jul 2026 00:10:29 +0200
Subject: [PATCH 02/11] Build

---
 PasteIntoFile.sln | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PasteIntoFile.sln b/PasteIntoFile.sln
index 7623209..e9e5318 100644
--- a/PasteIntoFile.sln
+++ b/PasteIntoFile.sln
@@ -17,6 +17,10 @@ Global
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 941b94c61c92b27be944c90cdc1648a295d2151a Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Fri, 17 Jul 2026 00:27:03 +0200
Subject: [PATCH 03/11] Build

---
 PasteIntoFile.sln                                             | 3 +++
 PasteIntoFile/PasteIntoFile.csproj                            | 2 +-
 .../PasteIntoFileShellExtension.csproj                        | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PasteIntoFile.sln b/PasteIntoFile.sln
index e9e5318..3e71250 100644
--- a/PasteIntoFile.sln
+++ b/PasteIntoFile.sln
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile", "PasteIntoFile\PasteIntoFile.csproj", "{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2} = {3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFileShellExtension", "PasteIntoFileShellExtension\PasteIntoFileShellExtension.csproj", "{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}"
 EndProject
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index 3a8a524..5beb337 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -159,7 +159,7 @@
         <ItemGroup>
             <ShellFiles Include="..\PasteIntoFileShellExtension\bin\$(Configuration)\**\*.*" />
         </ItemGroup>
-        <Copy SourceFiles="@(ShellFiles)" DestinationFiles="@(ShellFiles-&gt;'$(OutDir)/%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+        <Copy SourceFiles="@(ShellFiles)" DestinationFolder="$(OutDir)" />
     </Target>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
index 6ed29d1..9b9ca78 100644
--- a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
+++ b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
@@ -17,7 +17,7 @@
             <Manifest Include="AppXManifest.xml" />
             <Icon Include="../PasteIntoFile/Resources/icon*.png" />
         </ItemGroup>
-        <Copy SourceFiles="@(Manifest)" DestinationFiles="@(Manifest-&gt;'$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
-        <Copy SourceFiles="@(Icon)" DestinationFiles="@(Icon-&gt;'$(OutDir)%(RecursiveDir)%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
+        <Copy SourceFiles="@(Manifest)" DestinationFolder="$(OutDir)" />
+        <Copy SourceFiles="@(Icon)" DestinationFolder="$(OutDir)" />
     </Target>
 </Project>

From ce5c6411e0ec2b91d7d94e36457168f14367afc0 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Fri, 17 Jul 2026 10:02:50 +0200
Subject: [PATCH 04/11] Upgrade to net9.0

---
 PasteIntoFile/App.config                 |  8 +-
 PasteIntoFile/ClipboardContents.cs       | 57 ++++++--------
 PasteIntoFile/Dialog.cs                  | 15 ++--
 PasteIntoFile/Main.cs                    | 61 +++------------
 PasteIntoFile/PasteIntoFile.csproj       | 94 ++++--------------------
 PasteIntoFile/Properties/AssemblyInfo.cs | 38 ----------
 6 files changed, 53 insertions(+), 220 deletions(-)
 delete mode 100644 PasteIntoFile/Properties/AssemblyInfo.cs

diff --git a/PasteIntoFile/App.config b/PasteIntoFile/App.config
index caa4704..fcc0bcf 100644
--- a/PasteIntoFile/App.config
+++ b/PasteIntoFile/App.config
@@ -5,12 +5,6 @@
             <section name="PasteIntoFile.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
-    </startup>
-    <System.Windows.Forms.ApplicationConfigurationSection>
-        <add key="DpiAwareness" value="PerMonitorV2" />
-    </System.Windows.Forms.ApplicationConfigurationSection>
     <userSettings>
         <PasteIntoFile.Properties.Settings>
             <setting name="clrClipboard" serializeAs="String">
@@ -69,4 +63,4 @@
             </setting>
         </PasteIntoFile.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/PasteIntoFile/ClipboardContents.cs b/PasteIntoFile/ClipboardContents.cs
index 33c1c2d..9e0512a 100644
--- a/PasteIntoFile/ClipboardContents.cs
+++ b/PasteIntoFile/ClipboardContents.cs
@@ -14,10 +14,8 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Ical.Net.DataTypes;
-using LINQtoCSV;
+using Csv;
 using PasteIntoFile.Properties;
-using PdfSharp.Drawing;
-using PdfSharp.Pdf;
 
 namespace PasteIntoFile {
 
@@ -173,7 +171,7 @@ public abstract class ImageLikeContent : BaseContent {
 
 
     public class ImageContent : ImageLikeContent {
-        public static readonly string[] EXTENSIONS = { "png", "bmp", "gif", "jpg", "pdf", "tif", "ico" };
+        public static readonly string[] EXTENSIONS = { "png", "bmp", "gif", "jpg", "tif", "ico" };
         public ImageContent(Image image) {
             Data = image;
         }
@@ -188,24 +186,6 @@ public override void SaveAs(string path, string extension, bool append = false)
                 throw new FormatException(string.Format(Resources.str_error_cliboard_format_missmatch, extension));
 
             switch (NormalizeExtension(extension)) {
-                case "pdf":
-                    // convert image to ximage
-                    var stream = new MemoryStream();
-                    image.Save(stream, image.RawFormat);
-                    stream.Position = 0;
-                    XImage img = XImage.FromStream(stream);
-                    // create pdf document
-                    PdfDocument document = new PdfDocument();
-                    document.Info.Creator = Resources.app_title;
-                    PdfPage page = document.AddPage();
-                    page.Width = XUnit.FromPoint(img.PointWidth);
-                    page.Height = XUnit.FromPoint(img.PointHeight);
-                    // insert image and save
-                    XGraphics gfx = XGraphics.FromPdfPage(page);
-                    gfx.DrawImage(img, 0, 0);
-                    document.Save(path);
-                    return;
-
                 case "ico":
                     using (var fs = new FileStream(path, FileMode.Create)) {
                         ImageAsIcon.Save(fs);
@@ -227,7 +207,6 @@ public override PreviewHolder Preview(string extension) {
             extension = NormalizeExtension(extension);
             // Special formats with intermediate conversion types
             switch (extension) {
-                case "pdf": extension = "png"; break;
                 case "ico": return PreviewHolder.ForImage(ImageAsIcon.ToBitmap());
             }
             // Find suitable codec and convert image
@@ -279,7 +258,7 @@ public Icon ImageAsIcon {
     /// Like ImageContent, but only for formats which support alpha channel
     /// </summary>
     public class TransparentImageContent : ImageContent {
-        public static new readonly string[] EXTENSIONS = { "png", "gif", "pdf", "tif", "ico" };
+        public static new readonly string[] EXTENSIONS = { "png", "gif", "tif", "ico" };
         public TransparentImageContent(Image image) : base(image) { }
         public override string[] Extensions => EXTENSIONS; // Note: gif has only alpha 100% or 0%
     }
@@ -535,19 +514,21 @@ public char Delimiter {
             }
         }
 
-        public class Row : List<DataRowItem>, IDataRow { }
-
         /// <summary>
         /// Parse the CVS data
         /// </summary>
         /// <returns>List of rows</returns>
-        public IEnumerable<Row> Parse() {
-            var context = new CsvContext();
-            var readConfig = new CsvFileDescription();
-            readConfig.FirstLineHasColumnNames = false;
-            readConfig.SeparatorChar = Delimiter;
-            var readStream = new StreamReader(new MemoryStream(readConfig.TextEncoding.GetBytes(Text)));
-            return context.Read<Row>(readStream, readConfig);
+        public IEnumerable<string[]> Parse() {
+            var options = new CsvOptions {
+                HeaderMode = HeaderMode.HeaderAbsent,
+                AllowNewLineInEnclosedFieldValues = true,
+                AllowBackSlashToEscapeQuote = true,
+            };
+            return CsvReader.ReadFromText(Text, options).Select(o => o.Values);
+        }
+
+        public string WithDelimeter(char delimeter) {
+            return CsvWriter.WriteToText(Parse(), delimeter);
         }
 
         /// <summary>
@@ -559,9 +540,9 @@ private string AsMarkdown() {
 
             var markdown = "";
             foreach (var row in Parse()) {
-                ncol = Math.Max(ncol, row.Count);
+                ncol = Math.Max(ncol, row.Length);
                 foreach (var item in row) {
-                    markdown += "|" + (item.Value ?? "").PadRight(10);
+                    markdown += "|" + (item ?? "").PadRight(10);
                 }
                 markdown += "|\n";
             }
@@ -576,6 +557,10 @@ public override string TextFor(string extension) {
             switch (NormalizeExtension(extension)) {
                 case "md":
                     return AsMarkdown();
+                case "tsv":
+                case "tab":
+                    return WithDelimeter('\t');
+                case "csv":
                 default:
                     return base.TextFor(extension);
             }
@@ -632,7 +617,7 @@ public override PreviewHolder Preview(string extension) {
                         + "\n</body>\n</html>\n",
                         description
                     );
-                } catch (SerializationException e) {
+                } catch (SerializationException) {
                     // ignored (default to text preview below)
                 }
             }
diff --git a/PasteIntoFile/Dialog.cs b/PasteIntoFile/Dialog.cs
index 8cea0ed..7aaa04e 100644
--- a/PasteIntoFile/Dialog.cs
+++ b/PasteIntoFile/Dialog.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using PasteIntoFile.Properties;
-using WK.Libraries.BetterFolderBrowserNS;
 
 namespace PasteIntoFile {
     public sealed partial class Dialog : MasterForm {
@@ -489,16 +488,12 @@ async Task CheckForUpdates() {
         }
 
         private void btnBrowseForFolder_Click(object sender, EventArgs e) {
-            BetterFolderBrowser betterFolderBrowser = new BetterFolderBrowser();
+            using var dialog = new FolderBrowserDialog();
+            dialog.Description = Resources.str_select_folder;
+            dialog.SelectedPath = txtCurrentLocation.Text;
 
-            betterFolderBrowser.Title = Resources.str_select_folder;
-            betterFolderBrowser.RootFolder = txtCurrentLocation.Text ?? Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-
-            // Allow multi-selection of folders.
-            betterFolderBrowser.Multiselect = false;
-
-            if (betterFolderBrowser.ShowDialog(this) == DialogResult.OK) {
-                txtCurrentLocation.Text = betterFolderBrowser.SelectedFolder;
+            if (dialog.ShowDialog(this) == DialogResult.OK) {
+                txtCurrentLocation.Text = dialog.SelectedPath;
             }
         }
 
diff --git a/PasteIntoFile/Main.cs b/PasteIntoFile/Main.cs
index 09f7a79..ac2b867 100644
--- a/PasteIntoFile/Main.cs
+++ b/PasteIntoFile/Main.cs
@@ -12,7 +12,6 @@
 using System.Threading;
 using CommandLine;
 using CommandLine.Text;
-using Microsoft.Toolkit.Uwp.Notifications;
 using PasteIntoFile.Properties;
 #if PORTABLE
 using Bluegrams.Application;
@@ -149,6 +148,8 @@ static int Main(string[] args) {
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
+            ApplicationConfiguration.Initialize();
 
             // parse command line arguments
             var parseResult = new Parser(with => with.HelpWriter = null)
@@ -327,11 +328,14 @@ static int RunTray(ArgsTray args = null) {
                 NotifyIcon icon = new NotifyIcon();
                 icon.Icon = Resources.app_icon;
                 icon.Text = Resources.app_title;
-                icon.ContextMenu = new ContextMenu(new[] {
-                    new MenuItem(Resources.str_open_paste_into_file, (s, e) => new Dialog(showDialogOverwrite: true).Show()),
-                    new MenuItem(Resources.str_settings, (s, e) => new Wizard().Show()),
-                    new MenuItem(Resources.str_exit, (s, e) => { Application.Exit(); }),
-                });
+                var menu = new ContextMenuStrip();
+                menu.Items.Add(Resources.str_open_paste_into_file, null,
+                    (_, _) => new Dialog(showDialogOverwrite: true).Show());
+                menu.Items.Add(Resources.str_settings, null,
+                    (_, _) => new Wizard().Show());
+                menu.Items.Add(Resources.str_exit, null,
+                    (_, _) => Application.Exit());
+                icon.ContextMenuStrip = menu;
                 icon.MouseClick += (sender, eventArgs) => {
                     if (eventArgs.Button == MouseButtons.Left) new Dialog(showDialogOverwrite: true).Show();
                 };
@@ -466,45 +470,6 @@ public static void RestartAppElevated(string location) {
             Application.Exit();
         }
 
-        /// <summary>
-        /// Shows a balloon message in the windows notification bar
-        /// </summary>
-        /// <param name="title">Title of the message</param>
-        /// <param name="message">Body of the message</param>
-        /// <param name="expire">Duration after which message is dismissed in second</param>
-        /// <param name="link">Optional link to visit when clicking the balloon</param>
-        /// <param name="silent">If true, make a silent balloon (default)</param>
-        public static void ShowBalloon(string title, string[] message, ushort expire = 5, string link = null, bool silent = true) {
-            try {
-                var builder = new ToastContentBuilder().AddText(title);
-                foreach (var s in message) {
-                    builder.AddText(s);
-                }
-
-                if (silent)
-                    builder.AddAudio(null, null, true);
-
-                if (link != null)
-                    builder.AddButton(Resources.str_open, ToastActivationType.Protocol, link);
-
-                builder.Show(toast => {
-                    if (expire > 0) {
-                        toast.ExpirationTime = DateTime.Now.AddSeconds(expire);
-                    }
-                });
-
-            } catch (SystemException) {
-                // Microsoft.Toolkit.Uwp requires Windows version 1809 (build 17763) or higher
-                // if that's not available, print to console instead
-                Console.WriteLine(title);
-                foreach (var s in message) {
-                    Console.WriteLine(s);
-                }
-
-            }
-        }
-
-
         /// <summary>
         /// Checks for updates
         /// To reduce server load, results are cached and frequent queries skipped
@@ -512,7 +477,6 @@ public static void ShowBalloon(string title, string[] message, ushort expire = 5
         /// <returns>If an update is available</returns>
         public static async Task<bool> CheckForUpdates() {
             if (!Settings.Default.updateChecksEnabled) return false;
-            bool newReleaseFound = false;
             if ((DateTime.Now - Settings.Default.updateLatestVersionLastCheck).TotalDays > 30) {
                 // Last check outdated, check again
                 Settings.Default.updateLatestVersionLastCheck = DateTime.Now;
@@ -523,7 +487,6 @@ public static async Task<bool> CheckForUpdates() {
                     var data = await client.GetStringAsync(new Uri("https://api.github.com/repos/eltos/PasteIntoFile/releases/latest"));
                     var match = Regex.Match(data, "\"(https://github.com/eltos/PasteIntoFile/releases/tag/v(\\d+(\\.\\d+)*))\"");
                     if (match.Success && match.Groups[2].Value != Settings.Default.updateLatestVersion) {
-                        newReleaseFound = true;
                         Settings.Default.updateLatestVersion = match.Groups[2].Value;
                         Settings.Default.updateLatestVersionLink = match.Groups[1].Value;
                         Settings.Default.Save();
@@ -538,10 +501,6 @@ public static async Task<bool> CheckForUpdates() {
                 var latestVersion = Version.Parse(Settings.Default.updateLatestVersion);
                 if (latestVersion.CompareTo(thisVersion) > 0) {
                     // Update available
-                    if (newReleaseFound) {
-                        ShowBalloon(string.Format(Resources.str_version_update_available, Application.ProductVersion, Settings.Default.updateLatestVersion),
-                            new[] { Settings.Default.updateLatestVersionLink }, 0, Settings.Default.updateLatestVersionLink, false);
-                    }
                     return true;
                 }
             } catch { /* ignore errors due to parsing of fetched version */ }
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index 5beb337..f2d8193 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -1,16 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0" DefaultTargets="Build">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<?xml version="1.0" encoding="UTF-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <ProjectGuid>{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}</ProjectGuid>
+        <AssemblyTitle>PasteIntoFile</AssemblyTitle>
+        <AssemblyName>PasteIntoFile</AssemblyName>
+        <Description>Paste Clipboard Contents Into Files</Description>
+        <Company>github.com/eltos</Company>
+        <Product>PasteIntoFile</Product>
+        <Copyright>Copyright © PasteIntoFile GitHub contributors</Copyright>
+        <AssemblyVersion>6.0.0.0</AssemblyVersion>
+        <FileVersion>6.0.0.0</FileVersion>
+        <Version>6.0.0</Version>
         <OutputType>WinExe</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <TargetFramework>net9.0-windows</TargetFramework>
         <RootNamespace>PasteIntoFile</RootNamespace>
-        <AssemblyName>PasteIntoFile</AssemblyName>
-        <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-        <StartupObject>PasteIntoFile.Program</StartupObject>
         <ApplicationManifest>app.manifest</ApplicationManifest>
+        <UseWindowsForms>true</UseWindowsForms>
         <ApplicationIcon>Resources/icon.ico</ApplicationIcon>
     </PropertyGroup>
     <!-- Build variants -->
@@ -46,73 +50,15 @@
     </PropertyGroup>
     <!-- Project components -->
     <ItemGroup>
-        <PackageReference Include="BetterFolderBrowser" Version="1.2.0" />
+        <PackageReference Include="Csv" Version="2.0.245" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
-        <PackageReference Include="Ical.Net" Version="5.1.0" />
-        <PackageReference Include="LINQtoCSV" Version="1.5.0" />
-        <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-        <PackageReference Include="PDFsharp" Version="1.50.5147" />
+        <PackageReference Include="Ical.Net" Version="5.2.3" />
     </ItemGroup>
     <ItemGroup Condition="'$(Flavor)'=='Portable'">
         <PackageReference Include="PortableSettingsProvider" Version="0.2.4" />
     </ItemGroup>
     <ItemGroup>
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System" />
-        <Reference Include="System.Configuration" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Deployment" />
-        <Reference Include="System.Design" />
-        <Reference Include="System.Drawing" />
-        <Reference Include="System.Drawing.Design" />
-        <Reference Include="System.IO.Compression" />
-        <Reference Include="System.IO.Compression.FileSystem" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="System.Net.Http.WebRequest" />
-        <Reference Include="System.Windows.Forms" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="ClipboardContents.cs" />
-        <Compile Include="ExplorerUtil.cs" />
-        <Compile Include="SystemEventMonitor.cs" />
-        <Compile Include="MasterForm.cs" />
-        <Compile Include="RegistryUtil.cs" />
-        <Compile Include="SeparableComboBox.cs">
-            <SubType>UserControl</SubType>
-        </Compile>
-        <Compile Include="TemplateEdit.cs">
-            <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="TemplateEdit.Designer.cs">
-            <DependentUpon>TemplateEdit.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Wizard.cs">
-            <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="Wizard.Designer.cs">
-            <DependentUpon>Wizard.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Dialog.cs">
-            <SubType>Form</SubType>
-        </Compile>
-        <Compile Include="Dialog.Designer.cs">
-            <DependentUpon>Dialog.cs</DependentUpon>
-        </Compile>
-        <Compile Include="Main.cs" />
-        <Compile Include="Properties\AssemblyInfo.cs" />
-        <Compile Include="Settings.cs" />
-        <EmbeddedResource Include="Properties\Resources.*.resx" />
-        <EmbeddedResource Include="Properties\Resources.resx">
-            <Generator>ResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-            <SubType>Designer</SubType>
-        </EmbeddedResource>
-        <Compile Include="Properties\Resources.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-            <DesignTime>True</DesignTime>
-        </Compile>
         <None Include="app.manifest">
             <SubType>Designer</SubType>
         </None>
@@ -120,13 +66,6 @@
             <Generator>SettingsSingleFileGenerator</Generator>
             <LastGenOutput>Settings.Designer.cs</LastGenOutput>
         </None>
-        <Compile Include="Properties\Settings.Designer.cs">
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Settings.settings</DependentUpon>
-            <DesignTimeSharedInput>True</DesignTimeSharedInput>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
         <None Include="App.config">
             <SubType>Designer</SubType>
         </None>
@@ -161,7 +100,6 @@
         </ItemGroup>
         <Copy SourceFiles="@(ShellFiles)" DestinationFolder="$(OutDir)" />
     </Target>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
          Other similar extension points exist, see Microsoft.Common.targets.
     <Target Name="BeforeBuild">
diff --git a/PasteIntoFile/Properties/AssemblyInfo.cs b/PasteIntoFile/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4bcef9d..0000000
--- a/PasteIntoFile/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("PasteIntoFile")]
-[assembly: AssemblyDescription("Paste Clipboard Contents Into Files")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("github.com/eltos")]
-[assembly: AssemblyProduct("PasteIntoFile")]
-[assembly: AssemblyCopyright("Copyright © PasteIntoFile GitHub contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3fc6ab13-4989-400b-85eb-381b5e5693df")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-#if DEBUG
-[assembly: AssemblyVersion("5.6.*")]
-#else
-[assembly: AssemblyVersion("5.6.1")]
-#endif

From 6fb2c560554ea3d2eab3d5eb003601f1cadd9a06 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Tue, 29 Sep 2026 20:46:23 +0200
Subject: [PATCH 05/11] EnableWindowsTargeting

---
 .github/workflows/pre-commit.yml   | 2 +-
 PasteIntoFile/PasteIntoFile.csproj | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index ba78d83..1aba38f 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
     pre-commit:
-        runs-on: ubuntu-latest
+        runs-on: windows-2025
         steps:
             - uses: actions/checkout@v4
             - uses: actions/setup-python@v3
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index f2d8193..8d57ec4 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -12,6 +12,7 @@
         <Version>6.0.0</Version>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net9.0-windows</TargetFramework>
+        <EnableWindowsTargeting>true</EnableWindowsTargeting>
         <RootNamespace>PasteIntoFile</RootNamespace>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <UseWindowsForms>true</UseWindowsForms>

From f46297811a2d123f9ffa13bdefe3fb60b665ba25 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 17:06:50 +0200
Subject: [PATCH 06/11] Fix for quoted paths and filenames

---
 PasteIntoFile/Main.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PasteIntoFile/Main.cs b/PasteIntoFile/Main.cs
index ac2b867..5f19409 100644
--- a/PasteIntoFile/Main.cs
+++ b/PasteIntoFile/Main.cs
@@ -192,8 +192,8 @@ static int RunPaste(ArgsPaste args) {
             bool? showDialogOverwrite = null;
 
             // filename and directory (one time options)
-            var directory = args.Directory ?? args.DirectoryFallback;
-            var filename = args.Filename;
+            var directory = (args.Directory ?? args.DirectoryFallback)?.Trim('\'', '"', ' ');
+            var filename = args.Filename?.Trim('\'', '"', ' ');
             if (!string.IsNullOrWhiteSpace(Path.GetDirectoryName(filename))) {
                 // filename contains full path, so use that instead
                 directory = Path.GetDirectoryName(filename);

From c3f101fc8979eb8e08552734d17be96b6afe7ba8 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 17:07:20 +0200
Subject: [PATCH 07/11] Add copy/replace/append entries

---
 PasteIntoFileShellExtension/AppxManifest.xml |   8 +
 PasteIntoFileShellExtension/Command.cs       | 402 +++++++++++++++++--
 2 files changed, 370 insertions(+), 40 deletions(-)

diff --git a/PasteIntoFileShellExtension/AppxManifest.xml b/PasteIntoFileShellExtension/AppxManifest.xml
index efe2ad0..287f168 100644
--- a/PasteIntoFileShellExtension/AppxManifest.xml
+++ b/PasteIntoFileShellExtension/AppxManifest.xml
@@ -18,6 +18,9 @@
                     <com:ComServer>
                         <com:SurrogateServer DisplayName="PasteIntoFile Shell Extension">
                             <com:Class Id="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="41C9024D-4DCC-4CFE-B19B-C267B2525F63" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="90220591-C089-4812-AF4B-510694581EF4" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
                         </com:SurrogateServer>
                     </com:ComServer>
                 </com:Extension>
@@ -29,6 +32,11 @@
                         <desktop5:ItemType Type="Directory\Background">
                             <desktop5:Verb Id="PasteIntoFilePasteDirectoryBackground" Clsid="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" />
                         </desktop5:ItemType>
+                        <desktop5:ItemType Type="*">
+                            <desktop5:Verb Id="PasteIntoFileCopy" Clsid="41C9024D-4DCC-4CFE-B19B-C267B2525F63" />
+                            <desktop5:Verb Id="PasteIntoFileReplace" Clsid="90220591-C089-4812-AF4B-510694581EF4" />
+                            <desktop5:Verb Id="PasteIntoFileAppend" Clsid="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" />
+                        </desktop5:ItemType>
                     </desktop4:FileExplorerContextMenus>
                 </desktop4:Extension>
             </Extensions>
diff --git a/PasteIntoFileShellExtension/Command.cs b/PasteIntoFileShellExtension/Command.cs
index cda4ff1..33174b4 100644
--- a/PasteIntoFileShellExtension/Command.cs
+++ b/PasteIntoFileShellExtension/Command.cs
@@ -5,59 +5,217 @@
 
 namespace PasteIntoFileShellExtension;
 
-[ComVisible(true)]
-[Guid(Command.ClassId)]
-[ProgId("PasteIntoFile.ShellExtension.PasteCommand")]
-[ClassInterface(ClassInterfaceType.None)]
-[ComDefaultInterface(typeof(IExplorerCommand))]
-public sealed class Command : IExplorerCommand {
-    public const string ClassId = "A6F24F95-0E3D-4A37-8E58-1F05D66E76A5";
+// Shared title constants — match the localized strings from the main app's Resources.
+// Since the shell extension runs in a surrogate process, we use hardcoded English titles
+// that match the default (English) resource strings.
+static class Titles {
+    public const string Paste = "PasteIntoFile";
+    public const string Copy = "Copy file contents";
+    public const string Replace = "Paste into (Replace)";
+    public const string Append = "Paste into (Append)";
+}
 
-    private const int S_OK = 0;
-    private const int E_NOTIMPL = unchecked((int)0x80004001);
-    private const int E_FAIL = unchecked((int)0x80004005);
+// Shared COM HRESULT constants
+static class HResult {
+    public const int S_OK = 0;
+    public const int S_FALSE = 1;
+    public const int E_NOTIMPL = unchecked((int)0x80004001);
+    public const int E_FAIL = unchecked((int)0x80004005);
+}
 
+// Shared COM class IDs — must match AppxManifest.xml registrations
+static class Clsids {
+    public const string Command = "A6F24F95-0E3D-4A37-8E58-1F05D66E76A5";
+    public const string CopyCommand = "41C9024D-4DCC-4CFE-B19B-C267B2525F63";
+    public const string ReplaceCommand = "90220591-C089-4812-AF4B-510694581EF4";
+    public const string AppendCommand = "668F5257-E4B7-4DE7-84AE-B1AA710F38F5";
+}
 
-    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        var title = "PasteIntoFile";
-        ppszName = Marshal.StringToCoTaskMemUni(title);
-        return S_OK;
+// Shared helper methods for common shell extension patterns
+static class ExplorerCommandHelpers {
+    // Check if exactly one file is selected and it exists on disk.
+    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
+    public static EXPCMDSTATE CheckSingleFileSelected(IShellItemArray psiItemArray) {
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+            if (shellItem != null) {
+                try {
+                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
+                        var path = Marshal.PtrToStringUni(pathPtr);
+                        Marshal.FreeCoTaskMem(pathPtr);
+                        if (!string.IsNullOrEmpty(path) && File.Exists(path)) {
+                            return EXPCMDSTATE.ECS_ENABLED;
+                        }
+                    }
+                } finally {
+                    Marshal.ReleaseComObject(shellItem);
+                }
+            }
+        }
+        return EXPCMDSTATE.ECS_HIDDEN;
+    }
 
+    // Extract the file system path of the first item in the array.
+    // Returns null if the array is empty or the path cannot be retrieved.
+    public static string? GetSingleItemPath(IShellItemArray psiItemArray) {
+        if (psiItemArray?.GetCount(out var count) != HResult.S_OK || count == 0) {
+            return null;
+        }
+        psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+        if (shellItem == null) {
+            return null;
+        }
+        try {
+            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) != HResult.S_OK || pathPtr == IntPtr.Zero) {
+                return null;
+            }
+            var path = Marshal.PtrToStringUni(pathPtr);
+            Marshal.FreeCoTaskMem(pathPtr);
+            return path;
+        } finally {
+            Marshal.ReleaseComObject(shellItem);
+        }
     }
 
-    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
-        var exePath = GetPasteIntoFileExecutablePath();
+    // Get the path to the PasteIntoFile executable relative to the assembly location.
+    public static string? GetPasteIntoFileExecutablePath() {
+        var extensionDirectory = Path.GetDirectoryName(typeof(Command).Assembly.Location);
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            extensionDirectory = AppContext.BaseDirectory;
+        }
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            return null;
+        }
+        return Path.Combine(extensionDirectory, "PasteIntoFile.exe");
+    }
 
+    // Shared GetIcon implementation — returns the executable icon or E_NOTIMPL.
+    public static int GetIcon(out IntPtr ppszIcon) {
+        var exePath = GetPasteIntoFileExecutablePath();
         if (!string.IsNullOrWhiteSpace(exePath) && File.Exists(exePath)) {
             ppszIcon = Marshal.StringToCoTaskMemUni(exePath + ",0");
-            return S_OK;
+            return HResult.S_OK;
         }
-
         ppszIcon = IntPtr.Zero;
-        return E_NOTIMPL;
+        return HResult.E_NOTIMPL;
+    }
+
+    // File extensions that do NOT support appending (binary / image formats)
+    public static readonly string[] AppendNotSupportedExtensions = new[] {
+        "bmp", "gif", "ico", "jpeg", "jpg", "png", "tif", "tiff", "webp", // images
+        "svg", // vector
+        "url"  // shortcuts
+    };
+
+    // Check if appending is supported for the given file path.
+    public static bool IsAppendSupported(string? path) {
+        if (string.IsNullOrEmpty(path)) {
+            return true;
+        }
+        var ext = Path.GetExtension(path)?.TrimStart('.').ToLowerInvariant();
+        return string.IsNullOrEmpty(ext) || Array.IndexOf(AppendNotSupportedExtensions, ext) < 0;
+    }
+
+    // Check if exactly one file is selected and append is supported for it.
+    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
+    public static EXPCMDSTATE CheckSingleFileSelectedWithAppendSupport(IShellItemArray psiItemArray) {
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+            if (shellItem != null) {
+                try {
+                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
+                        var path = Marshal.PtrToStringUni(pathPtr);
+                        Marshal.FreeCoTaskMem(pathPtr);
+                        if (!string.IsNullOrEmpty(path) && File.Exists(path) && IsAppendSupported(path)) {
+                            return EXPCMDSTATE.ECS_ENABLED;
+                        }
+                    }
+                } finally {
+                    Marshal.ReleaseComObject(shellItem);
+                }
+            }
+        }
+        return EXPCMDSTATE.ECS_HIDDEN;
+    }
+
+    // Invoke PasteIntoFile.exe with paste command for a specific file.
+    public static int InvokePasteIntoFile(IShellItemArray psiItemArray, bool overwrite, bool append) {
+        try {
+            var exePath = GetPasteIntoFileExecutablePath();
+            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
+                return HResult.E_FAIL;
+            }
+
+            var filePath = GetSingleItemPath(psiItemArray);
+            if (string.IsNullOrEmpty(filePath)) {
+                return HResult.E_FAIL;
+            }
+
+            var dir = Path.GetDirectoryName(filePath);
+            var fileName = Path.GetFileName(filePath);
+
+            var startInfo = new ProcessStartInfo {
+                FileName = exePath,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+            startInfo.ArgumentList.Add("paste");
+            startInfo.ArgumentList.Add("--directory=\"" + dir + "\"");
+            startInfo.ArgumentList.Add("--filename=\"" + fileName + "\"");
+            startInfo.ArgumentList.Add("--autosave=true");
+            if (overwrite) {
+                startInfo.ArgumentList.Add("--overwrite=true");
+            }
+            if (append) {
+                startInfo.ArgumentList.Add("--append");
+            }
+
+            Process.Start(startInfo);
+            return HResult.S_OK;
+        } catch {
+            return HResult.E_FAIL;
+        }
+    }
+}
+
+[ComVisible(true)]
+[Guid(Clsids.Command)]
+[ProgId("PasteIntoFile.ShellExtension.PasteCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class Command : IExplorerCommand {
+
+
+    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Paste);
+        return HResult.S_OK;
+    }
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
     }
 
     public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
         ppszInfotip = IntPtr.Zero;
-        return E_NOTIMPL;
+        return HResult.E_NOTIMPL;
     }
 
     public int GetCanonicalName(out Guid pguidCommandName) {
-        pguidCommandName = new Guid(ClassId);
-        return S_OK;
+        pguidCommandName = new Guid(Clsids.Command);
+        return HResult.S_OK;
     }
 
     public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
         pCmdState = EXPCMDSTATE.ECS_ENABLED;
-        return S_OK;
+        return HResult.S_OK;
     }
 
     public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
         try {
-            var exePath = GetPasteIntoFileExecutablePath();
+            var exePath = ExplorerCommandHelpers.GetPasteIntoFileExecutablePath();
 
             if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
-                return E_FAIL;
+                return HResult.E_FAIL;
             }
 
             var targetFolder = TryGetTargetFolderPath(psiItemArray);
@@ -75,20 +233,20 @@ public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
             }
 
             Process.Start(startInfo);
-            return S_OK;
+            return HResult.S_OK;
         } catch {
-            return E_FAIL;
+            return HResult.E_FAIL;
         }
     }
 
     public int GetFlags(out EXPCMDFLAGS pFlags) {
         pFlags = EXPCMDFLAGS.ECF_DEFAULT;
-        return S_OK;
+        return HResult.S_OK;
     }
 
     public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
         ppEnum = null!;
-        return E_NOTIMPL;
+        return HResult.E_NOTIMPL;
     }
 
     private static string? TryGetTargetFolderPath(IShellItemArray? shellItemArray) {
@@ -97,7 +255,7 @@ public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
         }
 
         try {
-            if (shellItemArray.GetCount(out var count) != S_OK || count == 0) {
+            if (shellItemArray.GetCount(out var count) != HResult.S_OK || count == 0) {
                 return null;
             }
 
@@ -105,7 +263,7 @@ public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
                 IShellItem? shellItem = null;
 
                 try {
-                    if (shellItemArray.GetItemAt(i, out shellItem) != S_OK || shellItem == null) {
+                    if (shellItemArray.GetItemAt(i, out shellItem) != HResult.S_OK || shellItem == null) {
                         continue;
                     }
 
@@ -139,7 +297,7 @@ public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
         IntPtr pathPtr = IntPtr.Zero;
 
         try {
-            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out pathPtr) != S_OK || pathPtr == IntPtr.Zero) {
+            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out pathPtr) != HResult.S_OK || pathPtr == IntPtr.Zero) {
                 return null;
             }
 
@@ -152,22 +310,175 @@ public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
             }
         }
     }
+}
 
-    private static string? GetPasteIntoFileExecutablePath() {
-        var extensionDirectory = Path.GetDirectoryName(typeof(Command).Assembly.Location);
+// ─── Copy file contents command ───────────────────────────────────────────
 
-        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
-            extensionDirectory = AppContext.BaseDirectory;
-        }
+[ComVisible(true)]
+[Guid(Clsids.CopyCommand)]
+[ProgId("PasteIntoFile.ShellExtension.CopyCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class CopyCommand : IExplorerCommand {
 
-        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
-            return null;
+    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Copy);
+        return HResult.S_OK;
+    }
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
+    }
+
+    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
+        ppszInfotip = IntPtr.Zero;
+        return HResult.E_NOTIMPL;
+    }
+
+    public int GetCanonicalName(out Guid pguidCommandName) {
+        pguidCommandName = new Guid(Clsids.CopyCommand);
+        return HResult.S_OK;
+    }
+
+    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelected(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        try {
+            var exePath = ExplorerCommandHelpers.GetPasteIntoFileExecutablePath();
+            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
+                return HResult.E_FAIL;
+            }
+
+            var filePath = ExplorerCommandHelpers.GetSingleItemPath(psiItemArray);
+            if (string.IsNullOrEmpty(filePath)) {
+                return HResult.E_FAIL;
+            }
+
+            var startInfo = new ProcessStartInfo {
+                FileName = exePath,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+            startInfo.ArgumentList.Add("copy");
+            startInfo.ArgumentList.Add(filePath);
+            Process.Start(startInfo);
+            return HResult.S_OK;
+        } catch {
+            return HResult.E_FAIL;
         }
+    }
 
-        return Path.Combine(extensionDirectory, "PasteIntoFile.exe");
+    public int GetFlags(out EXPCMDFLAGS pFlags) {
+        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
+        return HResult.S_OK;
+    }
+
+    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        ppEnum = null!;
+        return HResult.E_NOTIMPL;
+    }
+}
+
+// ─── Replace file contents command ────────────────────────────────────────
+
+[ComVisible(true)]
+[Guid(Clsids.ReplaceCommand)]
+[ProgId("PasteIntoFile.ShellExtension.ReplaceCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class ReplaceCommand : IExplorerCommand {
+
+    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Replace);
+        return HResult.S_OK;
+    }
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
+    }
+
+    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
+        ppszInfotip = IntPtr.Zero;
+        return HResult.E_NOTIMPL;
+    }
+
+    public int GetCanonicalName(out Guid pguidCommandName) {
+        pguidCommandName = new Guid(Clsids.ReplaceCommand);
+        return HResult.S_OK;
+    }
+
+    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelected(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return ExplorerCommandHelpers.InvokePasteIntoFile(psiItemArray, overwrite: true, append: false);
+    }
+
+    public int GetFlags(out EXPCMDFLAGS pFlags) {
+        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
+        return HResult.S_OK;
+    }
+
+    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        ppEnum = null!;
+        return HResult.E_NOTIMPL;
+    }
+}
+
+// ─── Append to file command ───────────────────────────────────────────────
+
+[ComVisible(true)]
+[Guid(Clsids.AppendCommand)]
+[ProgId("PasteIntoFile.ShellExtension.AppendCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class AppendCommand : IExplorerCommand {
+
+    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Append);
+        return HResult.S_OK;
+    }
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
+    }
+
+    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
+        ppszInfotip = IntPtr.Zero;
+        return HResult.E_NOTIMPL;
+    }
+
+    public int GetCanonicalName(out Guid pguidCommandName) {
+        pguidCommandName = new Guid(Clsids.AppendCommand);
+        return HResult.S_OK;
+    }
+
+    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelectedWithAppendSupport(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return ExplorerCommandHelpers.InvokePasteIntoFile(psiItemArray, overwrite: false, append: true);
+    }
+
+    public int GetFlags(out EXPCMDFLAGS pFlags) {
+        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
+        return HResult.S_OK;
+    }
+
+    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        ppEnum = null!;
+        return HResult.E_NOTIMPL;
     }
 }
 
+
 [ComVisible(true)]
 [Guid("A08CE4D0-FA25-44AB-B57C-C7B1C323E0B9")]
 [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
@@ -302,6 +613,17 @@ out int piOrder
 [Guid("A88826F8-186F-4987-AADE-EA0CEF8FBFE8")]
 [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 public interface IEnumExplorerCommand {
+    [PreserveSig]
+    int Next(uint celt, out IExplorerCommand rgelt, out uint pceltFetched);
+
+    [PreserveSig]
+    int Skip(uint celt);
+
+    [PreserveSig]
+    int Reset();
+
+    [PreserveSig]
+    int Clone(out IEnumExplorerCommand ppEnum);
 }
 
 public enum EXPCMDSTATE {

From ab0f973dc49443a2147d4dc06cd858523ce59b37 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 19:10:51 +0200
Subject: [PATCH 08/11] Shared Settings

---
 PasteIntoFile.Core/PasteIntoFile.Core.csproj  | 22 +++++
 .../Properties/Settings.Designer.cs           | 26 +++---
 .../Properties/Settings.settings              | 19 +++--
 PasteIntoFile.Core/Settings.cs                |  9 +++
 PasteIntoFile.Core/SettingsUtil.cs            | 81 +++++++++++++++++++
 PasteIntoFile.sln                             | 10 +++
 PasteIntoFile/ClipboardContents.cs            |  1 +
 PasteIntoFile/Dialog.Designer.cs              |  1 +
 PasteIntoFile/Dialog.cs                       |  1 +
 PasteIntoFile/Main.cs                         | 11 +--
 PasteIntoFile/MasterForm.cs                   |  1 +
 PasteIntoFile/PasteIntoFile.csproj            |  8 +-
 PasteIntoFile/RegistryUtil.cs                 |  1 +
 PasteIntoFile/Settings.cs                     |  4 -
 PasteIntoFile/TemplateEdit.Designer.cs        |  1 +
 PasteIntoFile/TemplateEdit.cs                 |  1 +
 PasteIntoFile/Wizard.Designer.cs              |  1 +
 PasteIntoFile/Wizard.cs                       |  2 +-
 18 files changed, 158 insertions(+), 42 deletions(-)
 create mode 100644 PasteIntoFile.Core/PasteIntoFile.Core.csproj
 rename {PasteIntoFile => PasteIntoFile.Core}/Properties/Settings.Designer.cs (98%)
 rename {PasteIntoFile => PasteIntoFile.Core}/Properties/Settings.settings (89%)
 create mode 100644 PasteIntoFile.Core/Settings.cs
 create mode 100644 PasteIntoFile.Core/SettingsUtil.cs
 delete mode 100644 PasteIntoFile/Settings.cs

diff --git a/PasteIntoFile.Core/PasteIntoFile.Core.csproj b/PasteIntoFile.Core/PasteIntoFile.Core.csproj
new file mode 100644
index 0000000..a5317ee
--- /dev/null
+++ b/PasteIntoFile.Core/PasteIntoFile.Core.csproj
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <TargetFramework>net9.0-windows</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <RootNamespace>PasteIntoFile.Core</RootNamespace>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Include="Properties\Settings.settings">
+            <Generator>SettingsSingleFileGenerator</Generator>
+            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+        </None>
+        <Compile Update="Properties\Settings.Designer.cs">
+            <DesignTimeSharedInput>True</DesignTimeSharedInput>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Settings.settings</DependentUpon>
+        </Compile>
+        <PackageReference Include="PortableSettingsProvider" Version="0.2.5" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
+    </ItemGroup>
+</Project>
diff --git a/PasteIntoFile/Properties/Settings.Designer.cs b/PasteIntoFile.Core/Properties/Settings.Designer.cs
similarity index 98%
rename from PasteIntoFile/Properties/Settings.Designer.cs
rename to PasteIntoFile.Core/Properties/Settings.Designer.cs
index 7188d72..98e496a 100644
--- a/PasteIntoFile/Properties/Settings.Designer.cs
+++ b/PasteIntoFile.Core/Properties/Settings.Designer.cs
@@ -7,12 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PasteIntoFile.Properties {
+namespace PasteIntoFile.Core {
 
 
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
 
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
 
@@ -25,36 +25,36 @@ public static Settings Default {
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool clrClipboard {
+        public bool autoSave {
             get {
-                return ((bool)(this["clrClipboard"]));
+                return ((bool)(this["autoSave"]));
             }
             set {
-                this["clrClipboard"] = value;
+                this["autoSave"] = value;
             }
         }
 
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
-        public bool firstLaunch {
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool clrClipboard {
             get {
-                return ((bool)(this["firstLaunch"]));
+                return ((bool)(this["clrClipboard"]));
             }
             set {
-                this["firstLaunch"] = value;
+                this["clrClipboard"] = value;
             }
         }
 
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
-        public bool autoSave {
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool firstLaunch {
             get {
-                return ((bool)(this["autoSave"]));
+                return ((bool)(this["firstLaunch"]));
             }
             set {
-                this["autoSave"] = value;
+                this["firstLaunch"] = value;
             }
         }
 
diff --git a/PasteIntoFile/Properties/Settings.settings b/PasteIntoFile.Core/Properties/Settings.settings
similarity index 89%
rename from PasteIntoFile/Properties/Settings.settings
rename to PasteIntoFile.Core/Properties/Settings.settings
index 5104419..5a7de8b 100644
--- a/PasteIntoFile/Properties/Settings.settings
+++ b/PasteIntoFile.Core/Properties/Settings.settings
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)"
-              GeneratedClassNamespace="PasteIntoFile.Properties" GeneratedClassName="Settings">
-  <Profiles/>
+<?xml version="1.0" encoding="UTF-8"?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="PasteIntoFile.Core" GeneratedClassName="Settings">
+  <Profiles />
   <Settings>
+    <Setting Name="autoSave" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
     <Setting Name="clrClipboard" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="firstLaunch" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="autoSave" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
     <Setting Name="filenameTemplate" Type="System.String" Scope="User">
       <Value Profile="(Default)">{0:yyyy-MM-dd HH-mm-ss}</Value>
     </Setting>
@@ -34,10 +33,10 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="updateLatestVersion" Type="System.String" Scope="User">
-      <Value Profile="(Default)"/>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="updateLatestVersionLink" Type="System.String" Scope="User">
-      <Value Profile="(Default)"/>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="updateLatestVersionLastCheck" Type="System.DateTime" Scope="User">
       <Value Profile="(Default)">2000-01-01</Value>
@@ -52,7 +51,7 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="language" Type="System.String" Scope="User">
-      <Value Profile="(Default)"/>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="enableLiveClipboardUpdate" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
diff --git a/PasteIntoFile.Core/Settings.cs b/PasteIntoFile.Core/Settings.cs
new file mode 100644
index 0000000..bb215ad
--- /dev/null
+++ b/PasteIntoFile.Core/Settings.cs
@@ -0,0 +1,9 @@
+namespace PasteIntoFile.Core;
+
+/// <summary>
+/// Shared settings class that both the main app and shell extension use.
+/// Properties are generated by Settings.Designer.cs from Settings.settings.
+/// Call SettingsUtil.Apply(Settings.Default) before accessing any settings.
+/// </summary>
+public sealed partial class Settings {
+}
diff --git a/PasteIntoFile.Core/SettingsUtil.cs b/PasteIntoFile.Core/SettingsUtil.cs
new file mode 100644
index 0000000..d0931c8
--- /dev/null
+++ b/PasteIntoFile.Core/SettingsUtil.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Configuration;
+using System.IO;
+using Bluegrams.Application;
+
+namespace PasteIntoFile.Core;
+
+/// <summary>
+/// Utility to configure and apply PortableSettingsProvider with the correct
+/// settings file path. In installer mode, settings are stored in
+/// %APPDATA%\PasteIntoFile\user.config. In portable mode (#if PORTABLE),
+/// settings are stored next to the executable.
+/// </summary>
+public static class SettingsUtil {
+    private const string SettingsFileName = "user.config";
+    private const string AppDataFolderName = "PasteIntoFile";
+
+    /// <summary>
+    /// Applies the PortableSettingsProvider to the given settings instance,
+    /// configuring it to use the shared settings file path.
+    /// Call this once at application startup before accessing any settings.
+    /// </summary>
+    public static void Apply(ApplicationSettingsBase settings) {
+        PortableSettingsProvider.SettingsFileName = SettingsFileName;
+        PortableSettingsProvider.SettingsDirectory = GetSettingsDirectory();
+        PortableSettingsProvider.ApplyProvider(settings);
+    }
+
+    /// <summary>
+    /// Returns the full path to the shared settings file.
+    /// </summary>
+    public static string SettingsFilePath => Path.Combine(GetSettingsDirectory(), SettingsFileName);
+
+    private static string GetSettingsDirectory() {
+#if PORTABLE
+        var assemblyPath = typeof(SettingsUtil).Assembly.Location;
+        return Path.GetDirectoryName(assemblyPath) ?? AppContext.BaseDirectory;
+#else
+        var appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
+        var settingsDir = Path.Combine(appData, AppDataFolderName);
+        if (!Directory.Exists(settingsDir)) {
+            Directory.CreateDirectory(settingsDir);
+        }
+        return settingsDir;
+#endif
+    }
+
+    /// <summary>
+    /// Reloads the settings from disk only if the settings file has been modified
+    /// since the last successful reload. This avoids expensive file I/O on slow
+    /// storage (USB flash drives, network shares) when the file hasn't changed.
+    /// Returns true if a reload was performed, false if the cached value was still valid.
+    /// </summary>
+    public static bool ReloadIfChanged(ApplicationSettingsBase settings) {
+        var filePath = SettingsFilePath;
+        try {
+            if (!File.Exists(filePath)) {
+                // File doesn't exist — nothing to reload
+                return false;
+            }
+
+            var lastWriteTime = File.GetLastWriteTimeUtc(filePath);
+
+            if (lastWriteTime <= sLastReloadTime) {
+                // File hasn't changed since last reload — skip the expensive Reload()
+                return false;
+            }
+
+            settings.Reload();
+            sLastReloadTime = lastWriteTime;
+            return true;
+        } catch {
+            // If we can't check the file, fall back to always reloading
+            // to ensure we get the latest value
+            settings.Reload();
+            return true;
+        }
+    }
+
+    private static DateTime sLastReloadTime;
+}
diff --git a/PasteIntoFile.sln b/PasteIntoFile.sln
index 3e71250..830f801 100644
--- a/PasteIntoFile.sln
+++ b/PasteIntoFile.sln
@@ -3,12 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile.Core", "PasteIntoFile.Core\PasteIntoFile.Core.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile", "PasteIntoFile\PasteIntoFile.csproj", "{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2} = {3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFileShellExtension", "PasteIntoFileShellExtension\PasteIntoFileShellExtension.csproj", "{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,6 +22,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6F4215C-6CD7-4279-9C4C-C2DA9A823D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/PasteIntoFile/ClipboardContents.cs b/PasteIntoFile/ClipboardContents.cs
index 9e0512a..1e8271a 100644
--- a/PasteIntoFile/ClipboardContents.cs
+++ b/PasteIntoFile/ClipboardContents.cs
@@ -15,6 +15,7 @@
 using System.Windows.Forms;
 using Ical.Net.DataTypes;
 using Csv;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Dialog.Designer.cs b/PasteIntoFile/Dialog.Designer.cs
index 5aa91e9..912a1ab 100644
--- a/PasteIntoFile/Dialog.Designer.cs
+++ b/PasteIntoFile/Dialog.Designer.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Drawing;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Dialog.cs b/PasteIntoFile/Dialog.cs
index 7aaa04e..8aea0e0 100644
--- a/PasteIntoFile/Dialog.cs
+++ b/PasteIntoFile/Dialog.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Main.cs b/PasteIntoFile/Main.cs
index 5f19409..417981d 100644
--- a/PasteIntoFile/Main.cs
+++ b/PasteIntoFile/Main.cs
@@ -12,10 +12,8 @@
 using System.Threading;
 using CommandLine;
 using CommandLine.Text;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
-#if PORTABLE
-using Bluegrams.Application;
-#endif
 
 namespace PasteIntoFile {
     static class Program {
@@ -120,11 +118,8 @@ static int Main(string[] args) {
                 // ignored (probably non-console mode)
             }
 
-#if PORTABLE
-            // Portable settings
-            PortableSettingsProvider.SettingsFileName = "settings.config";
-            PortableSettingsProvider.ApplyProvider(Settings.Default);
-#endif
+            // Configure settings provider to use the shared settings file path
+            SettingsUtil.Apply(Settings.Default);
 
             // Localization
             try {
diff --git a/PasteIntoFile/MasterForm.cs b/PasteIntoFile/MasterForm.cs
index b4cb745..ab24052 100644
--- a/PasteIntoFile/MasterForm.cs
+++ b/PasteIntoFile/MasterForm.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index 8d57ec4..8a9830b 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -56,17 +56,13 @@
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
         <PackageReference Include="Ical.Net" Version="5.2.3" />
     </ItemGroup>
-    <ItemGroup Condition="'$(Flavor)'=='Portable'">
-        <PackageReference Include="PortableSettingsProvider" Version="0.2.4" />
+    <ItemGroup>
+        <ProjectReference Include="..\PasteIntoFile.Core\PasteIntoFile.Core.csproj" />
     </ItemGroup>
     <ItemGroup>
         <None Include="app.manifest">
             <SubType>Designer</SubType>
         </None>
-        <None Include="Properties\Settings.settings">
-            <Generator>SettingsSingleFileGenerator</Generator>
-            <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-        </None>
         <None Include="App.config">
             <SubType>Designer</SubType>
         </None>
diff --git a/PasteIntoFile/RegistryUtil.cs b/PasteIntoFile/RegistryUtil.cs
index 2af2ea7..d3dfdf3 100644
--- a/PasteIntoFile/RegistryUtil.cs
+++ b/PasteIntoFile/RegistryUtil.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Microsoft.Win32;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Settings.cs b/PasteIntoFile/Settings.cs
deleted file mode 100644
index 57a5435..0000000
--- a/PasteIntoFile/Settings.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace PasteIntoFile.Properties {
-    internal sealed partial class Settings {
-    }
-}
diff --git a/PasteIntoFile/TemplateEdit.Designer.cs b/PasteIntoFile/TemplateEdit.Designer.cs
index b4a3f53..d7f29c1 100644
--- a/PasteIntoFile/TemplateEdit.Designer.cs
+++ b/PasteIntoFile/TemplateEdit.Designer.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel;
 using System.Drawing;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/TemplateEdit.cs b/PasteIntoFile/TemplateEdit.cs
index adf8f11..90bf135 100644
--- a/PasteIntoFile/TemplateEdit.cs
+++ b/PasteIntoFile/TemplateEdit.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Wizard.Designer.cs b/PasteIntoFile/Wizard.Designer.cs
index 275a55c..a93980f 100644
--- a/PasteIntoFile/Wizard.Designer.cs
+++ b/PasteIntoFile/Wizard.Designer.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
 
 namespace PasteIntoFile {
diff --git a/PasteIntoFile/Wizard.cs b/PasteIntoFile/Wizard.cs
index f0a8586..a838afb 100644
--- a/PasteIntoFile/Wizard.cs
+++ b/PasteIntoFile/Wizard.cs
@@ -7,8 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using PasteIntoFile.Core;
 using PasteIntoFile.Properties;
-using Color = System.Drawing.Color;
 
 namespace PasteIntoFile {
     public sealed partial class Wizard : MasterForm {

From ca8b3e0be0dab1c2f1f221b8de3c92a3a4ccee2e Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 21:07:39 +0200
Subject: [PATCH 09/11] Refactor

---
 PasteIntoFileShellExtension/AppendCommand.cs  |  65 ++
 .../BaseExplorerCommand.cs                    | 402 +++++++++++
 PasteIntoFileShellExtension/Command.cs        | 680 ------------------
 PasteIntoFileShellExtension/CopyCommand.cs    |  27 +
 PasteIntoFileShellExtension/PasteCommand.cs   |  36 +
 .../PasteIntoFileShellExtension.csproj        |   3 +
 PasteIntoFileShellExtension/ReplaceCommand.cs |  27 +
 7 files changed, 560 insertions(+), 680 deletions(-)
 create mode 100644 PasteIntoFileShellExtension/AppendCommand.cs
 create mode 100644 PasteIntoFileShellExtension/BaseExplorerCommand.cs
 delete mode 100644 PasteIntoFileShellExtension/Command.cs
 create mode 100644 PasteIntoFileShellExtension/CopyCommand.cs
 create mode 100644 PasteIntoFileShellExtension/PasteCommand.cs
 create mode 100644 PasteIntoFileShellExtension/ReplaceCommand.cs

diff --git a/PasteIntoFileShellExtension/AppendCommand.cs b/PasteIntoFileShellExtension/AppendCommand.cs
new file mode 100644
index 0000000..2f19799
--- /dev/null
+++ b/PasteIntoFileShellExtension/AppendCommand.cs
@@ -0,0 +1,65 @@
+using System.Runtime.InteropServices;
+
+namespace PasteIntoFileShellExtension;
+
+[ComVisible(true)]
+[Guid(Clsids.AppendCommand)]
+[ProgId("PasteIntoFile.ShellExtension.AppendCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class AppendCommand : BaseExplorerCommand {
+
+    public override string Clsid => Clsids.AppendCommand;
+
+    public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Append);
+        return HResult.S_OK;
+    }
+
+    // File extensions that do NOT support appending (binary / image formats)
+    private static readonly string[] AppendNotSupportedExtensions = new[] {
+        "bmp", "gif", "ico", "jpeg", "jpg", "png", "tif", "tiff", "webp", // images
+        "svg", // vector
+        "url"  // shortcuts
+    };
+
+    // Check if appending is supported for the given file path.
+    private static bool IsAppendSupported(string? path) {
+        if (string.IsNullOrEmpty(path)) {
+            return true;
+        }
+        var ext = Path.GetExtension(path)?.TrimStart('.').ToLowerInvariant();
+        return string.IsNullOrEmpty(ext) || Array.IndexOf(AppendNotSupportedExtensions, ext) < 0;
+    }
+
+    // Check if exactly one file is selected and append is supported for it.
+    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
+    private static EXPCMDSTATE CheckSingleFileSelectedWithAppendSupport(IShellItemArray psiItemArray) {
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+            if (shellItem != null) {
+                try {
+                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
+                        var path = Marshal.PtrToStringUni(pathPtr);
+                        Marshal.FreeCoTaskMem(pathPtr);
+                        if (!string.IsNullOrEmpty(path) && File.Exists(path) && IsAppendSupported(path)) {
+                            return EXPCMDSTATE.ECS_ENABLED;
+                        }
+                    }
+                } finally {
+                    Marshal.ReleaseComObject(shellItem);
+                }
+            }
+        }
+        return EXPCMDSTATE.ECS_HIDDEN;
+    }
+
+    public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = CheckSingleFileSelectedWithAppendSupport(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public override int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return InvokePasteIntoFile(psiItemArray, PasteMode.Append);
+    }
+}
diff --git a/PasteIntoFileShellExtension/BaseExplorerCommand.cs b/PasteIntoFileShellExtension/BaseExplorerCommand.cs
new file mode 100644
index 0000000..7c8899e
--- /dev/null
+++ b/PasteIntoFileShellExtension/BaseExplorerCommand.cs
@@ -0,0 +1,402 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Runtime.InteropServices;
+using PasteIntoFile.Core;
+
+namespace PasteIntoFileShellExtension;
+
+// Shared title constants — match the localized strings from the main app's Resources.
+// Since the shell extension runs in a surrogate process, we use hardcoded English titles
+// that match the default (English) resource strings.
+static class Titles {
+    public const string Paste = "PasteIntoFile";
+    public const string Copy = "Copy file contents";
+    public const string Replace = "Paste into (Replace)";
+    public const string Append = "Paste into (Append)";
+}
+
+// Shared COM class IDs — must match AppxManifest.xml registrations
+static class Clsids {
+    public const string PasteCommand = "A6F24F95-0E3D-4A37-8E58-1F05D66E76A5";
+    public const string CopyCommand = "41C9024D-4DCC-4CFE-B19B-C267B2525F63";
+    public const string ReplaceCommand = "90220591-C089-4812-AF4B-510694581EF4";
+    public const string AppendCommand = "668F5257-E4B7-4DE7-84AE-B1AA710F38F5";
+}
+
+
+// ─── Abstract base for all explorer commands ──────────────────────────────
+// Implements the common IExplorerCommand boilerplate (GetIcon, GetToolTip,
+// GetCanonicalName, GetFlags, EnumSubCommands) so each derived command only
+// provides its title, state check, and invoke logic.
+
+public enum PasteMode { Paste, Copy, Replace, Append }
+
+public abstract class BaseExplorerCommand : IExplorerCommand {
+    static BaseExplorerCommand() {
+        // Configure settings provider to use the shared settings file path
+        SettingsUtil.Apply(Settings.Default);
+    }
+
+    public abstract string Clsid { get; }
+
+    // ─── Shared helper methods ───
+
+    // Get the path to the PasteIntoFile executable relative to the assembly location.
+    protected static string? GetPasteIntoFileExecutablePath() {
+        var extensionDirectory = Path.GetDirectoryName(typeof(BaseExplorerCommand).Assembly.Location);
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            extensionDirectory = AppContext.BaseDirectory;
+        }
+        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
+            return null;
+        }
+        return Path.Combine(extensionDirectory, "PasteIntoFile.exe");
+    }
+
+    // Check if exactly one file is selected and it exists on disk.
+    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
+    protected static EXPCMDSTATE CheckSingleFileSelected(IShellItemArray psiItemArray) {
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+            if (shellItem != null) {
+                try {
+                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
+                        var path = Marshal.PtrToStringUni(pathPtr);
+                        Marshal.FreeCoTaskMem(pathPtr);
+                        if (!string.IsNullOrEmpty(path) && File.Exists(path)) {
+                            return EXPCMDSTATE.ECS_ENABLED;
+                        }
+                    }
+                } finally {
+                    Marshal.ReleaseComObject(shellItem);
+                }
+            }
+        }
+        return EXPCMDSTATE.ECS_HIDDEN;
+    }
+
+    // Extract the file system path of the first item in the array.
+    // Returns null if the array is empty or the path cannot be retrieved.
+    protected static string? GetSingleItemPath(IShellItemArray? psiItemArray) {
+        if (psiItemArray?.GetCount(out var count) != HResult.S_OK || count == 0) {
+            return null;
+        }
+        psiItemArray.GetItemAt(0, out IShellItem? shellItem);
+        if (shellItem == null) {
+            return null;
+        }
+        try {
+            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) != HResult.S_OK || pathPtr == IntPtr.Zero) {
+                return null;
+            }
+            var path = Marshal.PtrToStringUni(pathPtr);
+            Marshal.FreeCoTaskMem(pathPtr);
+            return path;
+        } finally {
+            Marshal.ReleaseComObject(shellItem);
+        }
+    }
+
+    // Invoke PasteIntoFile with the specified mode.
+    // Handles all four command types: paste to directory, copy file contents, replace, and append.
+    protected static int InvokePasteIntoFile(IShellItemArray psiItemArray, PasteMode mode) {
+        try {
+            var exePath = GetPasteIntoFileExecutablePath();
+            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
+                return HResult.E_FAIL;
+            }
+
+            var startInfo = new ProcessStartInfo {
+                FileName = exePath,
+                UseShellExecute = false,
+                CreateNoWindow = true
+            };
+
+            var path = GetSingleItemPath(psiItemArray);
+
+            switch (mode) {
+                case PasteMode.Paste:
+                    startInfo.ArgumentList.Add("paste");
+                    if (!string.IsNullOrWhiteSpace(path)) {
+                        startInfo.ArgumentList.Add(path);
+                    }
+                    break;
+
+                case PasteMode.Copy:
+                    if (string.IsNullOrEmpty(path)) {
+                        return HResult.E_FAIL;
+                    }
+                    startInfo.ArgumentList.Add("copy");
+                    startInfo.ArgumentList.Add(path);
+                    break;
+
+                case PasteMode.Replace:
+                case PasteMode.Append:
+                    var directory = Path.GetDirectoryName(path);
+                    var file = Path.GetFileName(path);
+                    if (string.IsNullOrEmpty(directory) || string.IsNullOrEmpty(file)) {
+                        return HResult.E_FAIL;
+                    }
+                    startInfo.ArgumentList.Add("paste");
+                    startInfo.ArgumentList.Add(directory);
+                    startInfo.ArgumentList.Add("--filename");
+                    startInfo.ArgumentList.Add(file);
+                    startInfo.ArgumentList.Add("--autosave=true");
+                    startInfo.ArgumentList.Add(mode == PasteMode.Replace ? "--overwrite=true" : "--append");
+                    break;
+            }
+
+            Process.Start(startInfo);
+            return HResult.S_OK;
+        } catch {
+            return HResult.E_FAIL;
+        }
+    }
+
+    // ─── IExplorerCommand implementation ───
+
+    public abstract int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName);
+
+    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
+        var exePath = GetPasteIntoFileExecutablePath();
+        if (!string.IsNullOrWhiteSpace(exePath) && File.Exists(exePath)) {
+            ppszIcon = Marshal.StringToCoTaskMemUni(exePath + ",0");
+            return HResult.S_OK;
+        }
+        ppszIcon = IntPtr.Zero;
+        return HResult.E_NOTIMPL;
+    }
+
+    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
+        ppszInfotip = IntPtr.Zero;
+        return HResult.E_NOTIMPL;
+    }
+
+    public int GetCanonicalName(out Guid pguidCommandName) {
+        pguidCommandName = new Guid(Clsid);
+        return HResult.S_OK;
+    }
+
+    public abstract int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState);
+
+    public abstract int Invoke(IShellItemArray psiItemArray, IntPtr pbc);
+
+    public int GetFlags(out EXPCMDFLAGS pFlags) {
+        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
+        return HResult.S_OK;
+    }
+
+    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        ppEnum = null!;
+        return HResult.E_NOTIMPL;
+    }
+}
+
+[ComVisible(true)]
+[Guid("A08CE4D0-FA25-44AB-B57C-C7B1C323E0B9")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IExplorerCommand {
+    [PreserveSig]
+    int GetTitle(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszName
+    );
+
+    [PreserveSig]
+    int GetIcon(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszIcon
+    );
+
+    [PreserveSig]
+    int GetToolTip(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        out IntPtr ppszInfotip
+    );
+
+    [PreserveSig]
+    int GetCanonicalName(out Guid pguidCommandName);
+
+    [PreserveSig]
+    int GetState(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        [MarshalAs(UnmanagedType.Bool)] bool fOkToBeSlow,
+        out EXPCMDSTATE pCmdState
+    );
+
+    [PreserveSig]
+    int Invoke(
+        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
+        IntPtr pbc
+    );
+
+    [PreserveSig]
+    int GetFlags(out EXPCMDFLAGS pFlags);
+
+    [PreserveSig]
+    int EnumSubCommands(
+        [MarshalAs(UnmanagedType.Interface)] out IEnumExplorerCommand ppEnum
+    );
+}
+
+[ComImport]
+[Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IShellItemArray {
+    [PreserveSig]
+    int BindToHandler(
+        IntPtr pbc,
+        ref Guid bhid,
+        ref Guid riid,
+        out IntPtr ppvOut
+    );
+
+    [PreserveSig]
+    int GetPropertyStore(
+        GETPROPERTYSTOREFLAGS flags,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetPropertyDescriptionList(
+        ref PROPERTYKEY keyType,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetAttributes(
+        SIATTRIBFLAGS attribFlags,
+        uint sfgaoMask,
+        out uint psfgaoAttribs
+    );
+
+    [PreserveSig]
+    int GetCount(out uint pdwNumItems);
+
+    [PreserveSig]
+    int GetItemAt(
+        uint dwIndex,
+        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
+    );
+
+    [PreserveSig]
+    int EnumItems(out IntPtr ppenumShellItems);
+}
+
+[ComImport]
+[Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IShellItem {
+    [PreserveSig]
+    int BindToHandler(
+        IntPtr pbc,
+        ref Guid bhid,
+        ref Guid riid,
+        out IntPtr ppv
+    );
+
+    [PreserveSig]
+    int GetParent(
+        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
+    );
+
+    [PreserveSig]
+    int GetDisplayName(
+        SIGDN sigdnName,
+        out IntPtr ppszName
+    );
+
+    [PreserveSig]
+    int GetAttributes(
+        uint sfgaoMask,
+        out uint psfgaoAttribs
+    );
+
+    [PreserveSig]
+    int Compare(
+        [MarshalAs(UnmanagedType.Interface)] IShellItem psi,
+        uint hint,
+        out int piOrder
+    );
+}
+
+[ComImport]
+[Guid("A88826F8-186F-4987-AADE-EA0CEF8FBFE8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IEnumExplorerCommand {
+    [PreserveSig]
+    int Next(uint celt, out IExplorerCommand rgelt, out uint pceltFetched);
+
+    [PreserveSig]
+    int Skip(uint celt);
+
+    [PreserveSig]
+    int Reset();
+
+    [PreserveSig]
+    int Clone(out IEnumExplorerCommand ppEnum);
+}
+
+
+static class HResult {
+    public const int S_OK = 0;
+    public const int S_FALSE = 1;
+    public const int E_NOTIMPL = unchecked((int)0x80004001);
+    public const int E_FAIL = unchecked((int)0x80004005);
+}
+
+public enum EXPCMDSTATE {
+    ECS_ENABLED = 0,
+    ECS_DISABLED = 1,
+    ECS_HIDDEN = 2,
+    ECS_CHECKBOX = 4,
+    ECS_CHECKED = 8,
+    ECS_RADIOCHECK = 16
+}
+
+[Flags]
+public enum EXPCMDFLAGS {
+    ECF_DEFAULT = 0,
+    ECF_HASSUBCOMMANDS = 1,
+    ECF_HASSPLITBUTTON = 2,
+    ECF_HIDELABEL = 4,
+    ECF_ISSEPARATOR = 8,
+    ECF_HASLUASHIELD = 16,
+    ECF_SEPARATORBEFORE = 32,
+    ECF_SEPARATORAFTER = 64,
+    ECF_ISDROPDOWN = 128,
+    ECF_TOGGLEABLE = 256,
+    ECF_AUTOMENUICONS = 512
+}
+
+public enum SIGDN : uint {
+    SIGDN_NORMALDISPLAY = 0x00000000,
+    SIGDN_PARENTRELATIVEPARSING = 0x80018001,
+    SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
+    SIGDN_PARENTRELATIVEEDITING = 0x80031001,
+    SIGDN_DESKTOPABSOLUTEEDITING = 0x8004C000,
+    SIGDN_FILESYSPATH = 0x80058000,
+    SIGDN_URL = 0x80068000,
+    SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007C001,
+    SIGDN_PARENTRELATIVE = 0x80080001,
+    SIGDN_PARENTRELATIVEFORUI = 0x80094001
+}
+
+public enum GETPROPERTYSTOREFLAGS {
+    GPS_DEFAULT = 0
+}
+
+public enum SIATTRIBFLAGS {
+    SIATTRIBFLAGS_AND = 1,
+    SIATTRIBFLAGS_OR = 2,
+    SIATTRIBFLAGS_APPCOMPAT = 3
+}
+
+[StructLayout(LayoutKind.Sequential, Pack = 4)]
+public struct PROPERTYKEY {
+    public Guid fmtid;
+    public uint pid;
+}
diff --git a/PasteIntoFileShellExtension/Command.cs b/PasteIntoFileShellExtension/Command.cs
deleted file mode 100644
index 33174b4..0000000
--- a/PasteIntoFileShellExtension/Command.cs
+++ /dev/null
@@ -1,680 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.InteropServices;
-
-namespace PasteIntoFileShellExtension;
-
-// Shared title constants — match the localized strings from the main app's Resources.
-// Since the shell extension runs in a surrogate process, we use hardcoded English titles
-// that match the default (English) resource strings.
-static class Titles {
-    public const string Paste = "PasteIntoFile";
-    public const string Copy = "Copy file contents";
-    public const string Replace = "Paste into (Replace)";
-    public const string Append = "Paste into (Append)";
-}
-
-// Shared COM HRESULT constants
-static class HResult {
-    public const int S_OK = 0;
-    public const int S_FALSE = 1;
-    public const int E_NOTIMPL = unchecked((int)0x80004001);
-    public const int E_FAIL = unchecked((int)0x80004005);
-}
-
-// Shared COM class IDs — must match AppxManifest.xml registrations
-static class Clsids {
-    public const string Command = "A6F24F95-0E3D-4A37-8E58-1F05D66E76A5";
-    public const string CopyCommand = "41C9024D-4DCC-4CFE-B19B-C267B2525F63";
-    public const string ReplaceCommand = "90220591-C089-4812-AF4B-510694581EF4";
-    public const string AppendCommand = "668F5257-E4B7-4DE7-84AE-B1AA710F38F5";
-}
-
-// Shared helper methods for common shell extension patterns
-static class ExplorerCommandHelpers {
-    // Check if exactly one file is selected and it exists on disk.
-    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
-    public static EXPCMDSTATE CheckSingleFileSelected(IShellItemArray psiItemArray) {
-        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
-            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
-            if (shellItem != null) {
-                try {
-                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
-                        var path = Marshal.PtrToStringUni(pathPtr);
-                        Marshal.FreeCoTaskMem(pathPtr);
-                        if (!string.IsNullOrEmpty(path) && File.Exists(path)) {
-                            return EXPCMDSTATE.ECS_ENABLED;
-                        }
-                    }
-                } finally {
-                    Marshal.ReleaseComObject(shellItem);
-                }
-            }
-        }
-        return EXPCMDSTATE.ECS_HIDDEN;
-    }
-
-    // Extract the file system path of the first item in the array.
-    // Returns null if the array is empty or the path cannot be retrieved.
-    public static string? GetSingleItemPath(IShellItemArray psiItemArray) {
-        if (psiItemArray?.GetCount(out var count) != HResult.S_OK || count == 0) {
-            return null;
-        }
-        psiItemArray.GetItemAt(0, out IShellItem? shellItem);
-        if (shellItem == null) {
-            return null;
-        }
-        try {
-            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) != HResult.S_OK || pathPtr == IntPtr.Zero) {
-                return null;
-            }
-            var path = Marshal.PtrToStringUni(pathPtr);
-            Marshal.FreeCoTaskMem(pathPtr);
-            return path;
-        } finally {
-            Marshal.ReleaseComObject(shellItem);
-        }
-    }
-
-    // Get the path to the PasteIntoFile executable relative to the assembly location.
-    public static string? GetPasteIntoFileExecutablePath() {
-        var extensionDirectory = Path.GetDirectoryName(typeof(Command).Assembly.Location);
-        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
-            extensionDirectory = AppContext.BaseDirectory;
-        }
-        if (string.IsNullOrWhiteSpace(extensionDirectory)) {
-            return null;
-        }
-        return Path.Combine(extensionDirectory, "PasteIntoFile.exe");
-    }
-
-    // Shared GetIcon implementation — returns the executable icon or E_NOTIMPL.
-    public static int GetIcon(out IntPtr ppszIcon) {
-        var exePath = GetPasteIntoFileExecutablePath();
-        if (!string.IsNullOrWhiteSpace(exePath) && File.Exists(exePath)) {
-            ppszIcon = Marshal.StringToCoTaskMemUni(exePath + ",0");
-            return HResult.S_OK;
-        }
-        ppszIcon = IntPtr.Zero;
-        return HResult.E_NOTIMPL;
-    }
-
-    // File extensions that do NOT support appending (binary / image formats)
-    public static readonly string[] AppendNotSupportedExtensions = new[] {
-        "bmp", "gif", "ico", "jpeg", "jpg", "png", "tif", "tiff", "webp", // images
-        "svg", // vector
-        "url"  // shortcuts
-    };
-
-    // Check if appending is supported for the given file path.
-    public static bool IsAppendSupported(string? path) {
-        if (string.IsNullOrEmpty(path)) {
-            return true;
-        }
-        var ext = Path.GetExtension(path)?.TrimStart('.').ToLowerInvariant();
-        return string.IsNullOrEmpty(ext) || Array.IndexOf(AppendNotSupportedExtensions, ext) < 0;
-    }
-
-    // Check if exactly one file is selected and append is supported for it.
-    // Returns ECS_ENABLED if so, otherwise ECS_HIDDEN.
-    public static EXPCMDSTATE CheckSingleFileSelectedWithAppendSupport(IShellItemArray psiItemArray) {
-        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
-            psiItemArray.GetItemAt(0, out IShellItem? shellItem);
-            if (shellItem != null) {
-                try {
-                    if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
-                        var path = Marshal.PtrToStringUni(pathPtr);
-                        Marshal.FreeCoTaskMem(pathPtr);
-                        if (!string.IsNullOrEmpty(path) && File.Exists(path) && IsAppendSupported(path)) {
-                            return EXPCMDSTATE.ECS_ENABLED;
-                        }
-                    }
-                } finally {
-                    Marshal.ReleaseComObject(shellItem);
-                }
-            }
-        }
-        return EXPCMDSTATE.ECS_HIDDEN;
-    }
-
-    // Invoke PasteIntoFile.exe with paste command for a specific file.
-    public static int InvokePasteIntoFile(IShellItemArray psiItemArray, bool overwrite, bool append) {
-        try {
-            var exePath = GetPasteIntoFileExecutablePath();
-            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
-                return HResult.E_FAIL;
-            }
-
-            var filePath = GetSingleItemPath(psiItemArray);
-            if (string.IsNullOrEmpty(filePath)) {
-                return HResult.E_FAIL;
-            }
-
-            var dir = Path.GetDirectoryName(filePath);
-            var fileName = Path.GetFileName(filePath);
-
-            var startInfo = new ProcessStartInfo {
-                FileName = exePath,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-            startInfo.ArgumentList.Add("paste");
-            startInfo.ArgumentList.Add("--directory=\"" + dir + "\"");
-            startInfo.ArgumentList.Add("--filename=\"" + fileName + "\"");
-            startInfo.ArgumentList.Add("--autosave=true");
-            if (overwrite) {
-                startInfo.ArgumentList.Add("--overwrite=true");
-            }
-            if (append) {
-                startInfo.ArgumentList.Add("--append");
-            }
-
-            Process.Start(startInfo);
-            return HResult.S_OK;
-        } catch {
-            return HResult.E_FAIL;
-        }
-    }
-}
-
-[ComVisible(true)]
-[Guid(Clsids.Command)]
-[ProgId("PasteIntoFile.ShellExtension.PasteCommand")]
-[ClassInterface(ClassInterfaceType.None)]
-[ComDefaultInterface(typeof(IExplorerCommand))]
-public sealed class Command : IExplorerCommand {
-
-
-    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Paste);
-        return HResult.S_OK;
-    }
-
-    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
-        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
-    }
-
-    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
-        ppszInfotip = IntPtr.Zero;
-        return HResult.E_NOTIMPL;
-    }
-
-    public int GetCanonicalName(out Guid pguidCommandName) {
-        pguidCommandName = new Guid(Clsids.Command);
-        return HResult.S_OK;
-    }
-
-    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = EXPCMDSTATE.ECS_ENABLED;
-        return HResult.S_OK;
-    }
-
-    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
-        try {
-            var exePath = ExplorerCommandHelpers.GetPasteIntoFileExecutablePath();
-
-            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
-                return HResult.E_FAIL;
-            }
-
-            var targetFolder = TryGetTargetFolderPath(psiItemArray);
-
-            var startInfo = new ProcessStartInfo {
-                FileName = exePath,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-
-            startInfo.ArgumentList.Add("paste");
-
-            if (!string.IsNullOrWhiteSpace(targetFolder)) {
-                startInfo.ArgumentList.Add(targetFolder);
-            }
-
-            Process.Start(startInfo);
-            return HResult.S_OK;
-        } catch {
-            return HResult.E_FAIL;
-        }
-    }
-
-    public int GetFlags(out EXPCMDFLAGS pFlags) {
-        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
-        return HResult.S_OK;
-    }
-
-    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
-        ppEnum = null!;
-        return HResult.E_NOTIMPL;
-    }
-
-    private static string? TryGetTargetFolderPath(IShellItemArray? shellItemArray) {
-        if (shellItemArray == null) {
-            return null;
-        }
-
-        try {
-            if (shellItemArray.GetCount(out var count) != HResult.S_OK || count == 0) {
-                return null;
-            }
-
-            for (uint i = 0; i < count; i++) {
-                IShellItem? shellItem = null;
-
-                try {
-                    if (shellItemArray.GetItemAt(i, out shellItem) != HResult.S_OK || shellItem == null) {
-                        continue;
-                    }
-
-                    var path = TryGetFileSystemPath(shellItem);
-
-                    if (string.IsNullOrWhiteSpace(path)) {
-                        continue;
-                    }
-
-                    if (Directory.Exists(path)) {
-                        return path;
-                    }
-
-                    if (File.Exists(path)) {
-                        return Path.GetDirectoryName(path);
-                    }
-                } finally {
-                    if (shellItem != null) {
-                        Marshal.ReleaseComObject(shellItem);
-                    }
-                }
-            }
-        } catch {
-            return null;
-        }
-
-        return null;
-    }
-
-    private static string? TryGetFileSystemPath(IShellItem shellItem) {
-        IntPtr pathPtr = IntPtr.Zero;
-
-        try {
-            if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out pathPtr) != HResult.S_OK || pathPtr == IntPtr.Zero) {
-                return null;
-            }
-
-            return Marshal.PtrToStringUni(pathPtr);
-        } catch {
-            return null;
-        } finally {
-            if (pathPtr != IntPtr.Zero) {
-                Marshal.FreeCoTaskMem(pathPtr);
-            }
-        }
-    }
-}
-
-// ─── Copy file contents command ───────────────────────────────────────────
-
-[ComVisible(true)]
-[Guid(Clsids.CopyCommand)]
-[ProgId("PasteIntoFile.ShellExtension.CopyCommand")]
-[ClassInterface(ClassInterfaceType.None)]
-[ComDefaultInterface(typeof(IExplorerCommand))]
-public sealed class CopyCommand : IExplorerCommand {
-
-    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Copy);
-        return HResult.S_OK;
-    }
-
-    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
-        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
-    }
-
-    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
-        ppszInfotip = IntPtr.Zero;
-        return HResult.E_NOTIMPL;
-    }
-
-    public int GetCanonicalName(out Guid pguidCommandName) {
-        pguidCommandName = new Guid(Clsids.CopyCommand);
-        return HResult.S_OK;
-    }
-
-    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelected(psiItemArray);
-        return HResult.S_OK;
-    }
-
-    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
-        try {
-            var exePath = ExplorerCommandHelpers.GetPasteIntoFileExecutablePath();
-            if (string.IsNullOrWhiteSpace(exePath) || !File.Exists(exePath)) {
-                return HResult.E_FAIL;
-            }
-
-            var filePath = ExplorerCommandHelpers.GetSingleItemPath(psiItemArray);
-            if (string.IsNullOrEmpty(filePath)) {
-                return HResult.E_FAIL;
-            }
-
-            var startInfo = new ProcessStartInfo {
-                FileName = exePath,
-                UseShellExecute = false,
-                CreateNoWindow = true
-            };
-            startInfo.ArgumentList.Add("copy");
-            startInfo.ArgumentList.Add(filePath);
-            Process.Start(startInfo);
-            return HResult.S_OK;
-        } catch {
-            return HResult.E_FAIL;
-        }
-    }
-
-    public int GetFlags(out EXPCMDFLAGS pFlags) {
-        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
-        return HResult.S_OK;
-    }
-
-    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
-        ppEnum = null!;
-        return HResult.E_NOTIMPL;
-    }
-}
-
-// ─── Replace file contents command ────────────────────────────────────────
-
-[ComVisible(true)]
-[Guid(Clsids.ReplaceCommand)]
-[ProgId("PasteIntoFile.ShellExtension.ReplaceCommand")]
-[ClassInterface(ClassInterfaceType.None)]
-[ComDefaultInterface(typeof(IExplorerCommand))]
-public sealed class ReplaceCommand : IExplorerCommand {
-
-    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Replace);
-        return HResult.S_OK;
-    }
-
-    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
-        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
-    }
-
-    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
-        ppszInfotip = IntPtr.Zero;
-        return HResult.E_NOTIMPL;
-    }
-
-    public int GetCanonicalName(out Guid pguidCommandName) {
-        pguidCommandName = new Guid(Clsids.ReplaceCommand);
-        return HResult.S_OK;
-    }
-
-    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelected(psiItemArray);
-        return HResult.S_OK;
-    }
-
-    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
-        return ExplorerCommandHelpers.InvokePasteIntoFile(psiItemArray, overwrite: true, append: false);
-    }
-
-    public int GetFlags(out EXPCMDFLAGS pFlags) {
-        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
-        return HResult.S_OK;
-    }
-
-    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
-        ppEnum = null!;
-        return HResult.E_NOTIMPL;
-    }
-}
-
-// ─── Append to file command ───────────────────────────────────────────────
-
-[ComVisible(true)]
-[Guid(Clsids.AppendCommand)]
-[ProgId("PasteIntoFile.ShellExtension.AppendCommand")]
-[ClassInterface(ClassInterfaceType.None)]
-[ComDefaultInterface(typeof(IExplorerCommand))]
-public sealed class AppendCommand : IExplorerCommand {
-
-    public int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Append);
-        return HResult.S_OK;
-    }
-
-    public int GetIcon(IShellItemArray psiItemArray, out IntPtr ppszIcon) {
-        return ExplorerCommandHelpers.GetIcon(out ppszIcon);
-    }
-
-    public int GetToolTip(IShellItemArray psiItemArray, out IntPtr ppszInfotip) {
-        ppszInfotip = IntPtr.Zero;
-        return HResult.E_NOTIMPL;
-    }
-
-    public int GetCanonicalName(out Guid pguidCommandName) {
-        pguidCommandName = new Guid(Clsids.AppendCommand);
-        return HResult.S_OK;
-    }
-
-    public int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = ExplorerCommandHelpers.CheckSingleFileSelectedWithAppendSupport(psiItemArray);
-        return HResult.S_OK;
-    }
-
-    public int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
-        return ExplorerCommandHelpers.InvokePasteIntoFile(psiItemArray, overwrite: false, append: true);
-    }
-
-    public int GetFlags(out EXPCMDFLAGS pFlags) {
-        pFlags = EXPCMDFLAGS.ECF_DEFAULT;
-        return HResult.S_OK;
-    }
-
-    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
-        ppEnum = null!;
-        return HResult.E_NOTIMPL;
-    }
-}
-
-
-[ComVisible(true)]
-[Guid("A08CE4D0-FA25-44AB-B57C-C7B1C323E0B9")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IExplorerCommand {
-    [PreserveSig]
-    int GetTitle(
-        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
-        out IntPtr ppszName
-    );
-
-    [PreserveSig]
-    int GetIcon(
-        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
-        out IntPtr ppszIcon
-    );
-
-    [PreserveSig]
-    int GetToolTip(
-        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
-        out IntPtr ppszInfotip
-    );
-
-    [PreserveSig]
-    int GetCanonicalName(out Guid pguidCommandName);
-
-    [PreserveSig]
-    int GetState(
-        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
-        [MarshalAs(UnmanagedType.Bool)] bool fOkToBeSlow,
-        out EXPCMDSTATE pCmdState
-    );
-
-    [PreserveSig]
-    int Invoke(
-        [MarshalAs(UnmanagedType.Interface)] IShellItemArray psiItemArray,
-        IntPtr pbc
-    );
-
-    [PreserveSig]
-    int GetFlags(out EXPCMDFLAGS pFlags);
-
-    [PreserveSig]
-    int EnumSubCommands(
-        [MarshalAs(UnmanagedType.Interface)] out IEnumExplorerCommand ppEnum
-    );
-}
-
-[ComImport]
-[Guid("B63EA76D-1F85-456F-A19C-48159EFA858B")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IShellItemArray {
-    [PreserveSig]
-    int BindToHandler(
-        IntPtr pbc,
-        ref Guid bhid,
-        ref Guid riid,
-        out IntPtr ppvOut
-    );
-
-    [PreserveSig]
-    int GetPropertyStore(
-        GETPROPERTYSTOREFLAGS flags,
-        ref Guid riid,
-        out IntPtr ppv
-    );
-
-    [PreserveSig]
-    int GetPropertyDescriptionList(
-        ref PROPERTYKEY keyType,
-        ref Guid riid,
-        out IntPtr ppv
-    );
-
-    [PreserveSig]
-    int GetAttributes(
-        SIATTRIBFLAGS attribFlags,
-        uint sfgaoMask,
-        out uint psfgaoAttribs
-    );
-
-    [PreserveSig]
-    int GetCount(out uint pdwNumItems);
-
-    [PreserveSig]
-    int GetItemAt(
-        uint dwIndex,
-        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
-    );
-
-    [PreserveSig]
-    int EnumItems(out IntPtr ppenumShellItems);
-}
-
-[ComImport]
-[Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IShellItem {
-    [PreserveSig]
-    int BindToHandler(
-        IntPtr pbc,
-        ref Guid bhid,
-        ref Guid riid,
-        out IntPtr ppv
-    );
-
-    [PreserveSig]
-    int GetParent(
-        [MarshalAs(UnmanagedType.Interface)] out IShellItem ppsi
-    );
-
-    [PreserveSig]
-    int GetDisplayName(
-        SIGDN sigdnName,
-        out IntPtr ppszName
-    );
-
-    [PreserveSig]
-    int GetAttributes(
-        uint sfgaoMask,
-        out uint psfgaoAttribs
-    );
-
-    [PreserveSig]
-    int Compare(
-        [MarshalAs(UnmanagedType.Interface)] IShellItem psi,
-        uint hint,
-        out int piOrder
-    );
-}
-
-[ComImport]
-[Guid("A88826F8-186F-4987-AADE-EA0CEF8FBFE8")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IEnumExplorerCommand {
-    [PreserveSig]
-    int Next(uint celt, out IExplorerCommand rgelt, out uint pceltFetched);
-
-    [PreserveSig]
-    int Skip(uint celt);
-
-    [PreserveSig]
-    int Reset();
-
-    [PreserveSig]
-    int Clone(out IEnumExplorerCommand ppEnum);
-}
-
-public enum EXPCMDSTATE {
-    ECS_ENABLED = 0,
-    ECS_DISABLED = 1,
-    ECS_HIDDEN = 2,
-    ECS_CHECKBOX = 4,
-    ECS_CHECKED = 8,
-    ECS_RADIOCHECK = 16
-}
-
-[Flags]
-public enum EXPCMDFLAGS {
-    ECF_DEFAULT = 0,
-    ECF_HASSUBCOMMANDS = 1,
-    ECF_HASSPLITBUTTON = 2,
-    ECF_HIDELABEL = 4,
-    ECF_ISSEPARATOR = 8,
-    ECF_HASLUASHIELD = 16,
-    ECF_SEPARATORBEFORE = 32,
-    ECF_SEPARATORAFTER = 64,
-    ECF_ISDROPDOWN = 128,
-    ECF_TOGGLEABLE = 256,
-    ECF_AUTOMENUICONS = 512
-}
-
-public enum SIGDN : uint {
-    SIGDN_NORMALDISPLAY = 0x00000000,
-    SIGDN_PARENTRELATIVEPARSING = 0x80018001,
-    SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
-    SIGDN_PARENTRELATIVEEDITING = 0x80031001,
-    SIGDN_DESKTOPABSOLUTEEDITING = 0x8004C000,
-    SIGDN_FILESYSPATH = 0x80058000,
-    SIGDN_URL = 0x80068000,
-    SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007C001,
-    SIGDN_PARENTRELATIVE = 0x80080001,
-    SIGDN_PARENTRELATIVEFORUI = 0x80094001
-}
-
-public enum GETPROPERTYSTOREFLAGS {
-    GPS_DEFAULT = 0
-}
-
-public enum SIATTRIBFLAGS {
-    SIATTRIBFLAGS_AND = 1,
-    SIATTRIBFLAGS_OR = 2,
-    SIATTRIBFLAGS_APPCOMPAT = 3
-}
-
-[StructLayout(LayoutKind.Sequential, Pack = 4)]
-public struct PROPERTYKEY {
-    public Guid fmtid;
-    public uint pid;
-}
diff --git a/PasteIntoFileShellExtension/CopyCommand.cs b/PasteIntoFileShellExtension/CopyCommand.cs
new file mode 100644
index 0000000..bc65457
--- /dev/null
+++ b/PasteIntoFileShellExtension/CopyCommand.cs
@@ -0,0 +1,27 @@
+using System.Runtime.InteropServices;
+
+namespace PasteIntoFileShellExtension;
+
+[ComVisible(true)]
+[Guid(Clsids.CopyCommand)]
+[ProgId("PasteIntoFile.ShellExtension.CopyCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class CopyCommand : BaseExplorerCommand {
+
+    public override string Clsid => Clsids.CopyCommand;
+
+    public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Copy);
+        return HResult.S_OK;
+    }
+
+    public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = CheckSingleFileSelected(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public override int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return InvokePasteIntoFile(psiItemArray, PasteMode.Copy);
+    }
+}
diff --git a/PasteIntoFileShellExtension/PasteCommand.cs b/PasteIntoFileShellExtension/PasteCommand.cs
new file mode 100644
index 0000000..e1deacd
--- /dev/null
+++ b/PasteIntoFileShellExtension/PasteCommand.cs
@@ -0,0 +1,36 @@
+using System.Runtime.InteropServices;
+using PasteIntoFile.Core;
+
+namespace PasteIntoFileShellExtension;
+
+[ComVisible(true)]
+[Guid(Clsids.PasteCommand)]
+[ProgId("PasteIntoFile.ShellExtension.Command")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class PasteCommand : BaseExplorerCommand {
+
+    public override string Clsid => Clsids.PasteCommand;
+
+    public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        // Reload if the settings file has changed to reflect current autoSave mode
+        // while avoiding expensive file I/O on slow storage.
+        SettingsUtil.ReloadIfChanged(Settings.Default);
+
+        var title = Titles.Paste;
+        if (!Settings.Default.autoSave) {
+            title += "…";  // opens a dialog
+        }
+        ppszName = Marshal.StringToCoTaskMemUni(title);
+        return HResult.S_OK;
+    }
+
+    public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = EXPCMDSTATE.ECS_ENABLED;
+        return HResult.S_OK;
+    }
+
+    public override int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return InvokePasteIntoFile(psiItemArray, PasteMode.Paste);
+    }
+}
diff --git a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
index 9b9ca78..dfd201d 100644
--- a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
+++ b/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
@@ -12,6 +12,9 @@
         <!-- Hilfreich für COM-Komponenten, die dynamisch geladen werden -->
         <EnableDynamicLoading>true</EnableDynamicLoading>
     </PropertyGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\PasteIntoFile.Core\PasteIntoFile.Core.csproj" />
+    </ItemGroup>
     <Target Name="CopyFiles" AfterTargets="Build">
         <ItemGroup>
             <Manifest Include="AppXManifest.xml" />
diff --git a/PasteIntoFileShellExtension/ReplaceCommand.cs b/PasteIntoFileShellExtension/ReplaceCommand.cs
new file mode 100644
index 0000000..1ea42d8
--- /dev/null
+++ b/PasteIntoFileShellExtension/ReplaceCommand.cs
@@ -0,0 +1,27 @@
+using System.Runtime.InteropServices;
+
+namespace PasteIntoFileShellExtension;
+
+[ComVisible(true)]
+[Guid(Clsids.ReplaceCommand)]
+[ProgId("PasteIntoFile.ShellExtension.ReplaceCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class ReplaceCommand : BaseExplorerCommand {
+
+    public override string Clsid => Clsids.ReplaceCommand;
+
+    public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Titles.Replace);
+        return HResult.S_OK;
+    }
+
+    public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        pCmdState = CheckSingleFileSelected(psiItemArray);
+        return HResult.S_OK;
+    }
+
+    public override int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        return InvokePasteIntoFile(psiItemArray, PasteMode.Replace);
+    }
+}

From 4416e60f842ab4ea21909d45f7520a74f1215549 Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 21:12:07 +0200
Subject: [PATCH 10/11] Rename project

---
 .../AppendCommand.cs                                      | 0
 .../AppxManifest.xml                                      | 8 ++++----
 .../BaseExplorerCommand.cs                                | 0
 .../CopyCommand.cs                                        | 0
 .../PasteCommand.cs                                       | 0
 .../PasteIntoFile.ShellExtension.csproj                   | 1 +
 .../ReplaceCommand.cs                                     | 0
 PasteIntoFile.sln                                         | 2 +-
 PasteIntoFile/PasteIntoFile.csproj                        | 2 +-
 9 files changed, 7 insertions(+), 6 deletions(-)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/AppendCommand.cs (100%)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/AppxManifest.xml (90%)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/BaseExplorerCommand.cs (100%)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/CopyCommand.cs (100%)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/PasteCommand.cs (100%)
 rename PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj => PasteIntoFile.ShellExtension/PasteIntoFile.ShellExtension.csproj (94%)
 rename {PasteIntoFileShellExtension => PasteIntoFile.ShellExtension}/ReplaceCommand.cs (100%)

diff --git a/PasteIntoFileShellExtension/AppendCommand.cs b/PasteIntoFile.ShellExtension/AppendCommand.cs
similarity index 100%
rename from PasteIntoFileShellExtension/AppendCommand.cs
rename to PasteIntoFile.ShellExtension/AppendCommand.cs
diff --git a/PasteIntoFileShellExtension/AppxManifest.xml b/PasteIntoFile.ShellExtension/AppxManifest.xml
similarity index 90%
rename from PasteIntoFileShellExtension/AppxManifest.xml
rename to PasteIntoFile.ShellExtension/AppxManifest.xml
index 287f168..85de774 100644
--- a/PasteIntoFileShellExtension/AppxManifest.xml
+++ b/PasteIntoFile.ShellExtension/AppxManifest.xml
@@ -17,10 +17,10 @@
                 <com:Extension Category="windows.comServer">
                     <com:ComServer>
                         <com:SurrogateServer DisplayName="PasteIntoFile Shell Extension">
-                            <com:Class Id="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="41C9024D-4DCC-4CFE-B19B-C267B2525F63" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="90220591-C089-4812-AF4B-510694581EF4" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" Path="PasteIntoFileShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="41C9024D-4DCC-4CFE-B19B-C267B2525F63" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="90220591-C089-4812-AF4B-510694581EF4" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
                         </com:SurrogateServer>
                     </com:ComServer>
                 </com:Extension>
diff --git a/PasteIntoFileShellExtension/BaseExplorerCommand.cs b/PasteIntoFile.ShellExtension/BaseExplorerCommand.cs
similarity index 100%
rename from PasteIntoFileShellExtension/BaseExplorerCommand.cs
rename to PasteIntoFile.ShellExtension/BaseExplorerCommand.cs
diff --git a/PasteIntoFileShellExtension/CopyCommand.cs b/PasteIntoFile.ShellExtension/CopyCommand.cs
similarity index 100%
rename from PasteIntoFileShellExtension/CopyCommand.cs
rename to PasteIntoFile.ShellExtension/CopyCommand.cs
diff --git a/PasteIntoFileShellExtension/PasteCommand.cs b/PasteIntoFile.ShellExtension/PasteCommand.cs
similarity index 100%
rename from PasteIntoFileShellExtension/PasteCommand.cs
rename to PasteIntoFile.ShellExtension/PasteCommand.cs
diff --git a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj b/PasteIntoFile.ShellExtension/PasteIntoFile.ShellExtension.csproj
similarity index 94%
rename from PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
rename to PasteIntoFile.ShellExtension/PasteIntoFile.ShellExtension.csproj
index dfd201d..e8b9c62 100644
--- a/PasteIntoFileShellExtension/PasteIntoFileShellExtension.csproj
+++ b/PasteIntoFile.ShellExtension/PasteIntoFile.ShellExtension.csproj
@@ -11,6 +11,7 @@
         <RuntimeIdentifier>win-x64</RuntimeIdentifier>
         <!-- Hilfreich für COM-Komponenten, die dynamisch geladen werden -->
         <EnableDynamicLoading>true</EnableDynamicLoading>
+        <RootNamespace>PasteIntoFileShellExtension</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
         <ProjectReference Include="..\PasteIntoFile.Core\PasteIntoFile.Core.csproj" />
diff --git a/PasteIntoFileShellExtension/ReplaceCommand.cs b/PasteIntoFile.ShellExtension/ReplaceCommand.cs
similarity index 100%
rename from PasteIntoFileShellExtension/ReplaceCommand.cs
rename to PasteIntoFile.ShellExtension/ReplaceCommand.cs
diff --git a/PasteIntoFile.sln b/PasteIntoFile.sln
index 830f801..97b0c3e 100644
--- a/PasteIntoFile.sln
+++ b/PasteIntoFile.sln
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile", "PasteIntoF
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFileShellExtension", "PasteIntoFileShellExtension\PasteIntoFileShellExtension.csproj", "{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PasteIntoFile.ShellExtension", "PasteIntoFile.ShellExtension\PasteIntoFile.ShellExtension.csproj", "{3FF1060D-CD0D-43BE-8E4F-61D2C0475AF2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {A1B2C3D4-E5F6-7890-ABCD-EF1234567890}
 	EndProjectSection
diff --git a/PasteIntoFile/PasteIntoFile.csproj b/PasteIntoFile/PasteIntoFile.csproj
index 8a9830b..2c86668 100644
--- a/PasteIntoFile/PasteIntoFile.csproj
+++ b/PasteIntoFile/PasteIntoFile.csproj
@@ -93,7 +93,7 @@
     </ItemGroup>
     <Target Name="CopyShellExtension" AfterTargets="Build">
         <ItemGroup>
-            <ShellFiles Include="..\PasteIntoFileShellExtension\bin\$(Configuration)\**\*.*" />
+            <ShellFiles Include="..\PasteIntoFile.ShellExtension\bin\$(Configuration)\**\*.*" />
         </ItemGroup>
         <Copy SourceFiles="@(ShellFiles)" DestinationFolder="$(OutDir)" />
     </Target>

From ae9d432227eb91afaf0e7d9ceb359a631692968e Mon Sep 17 00:00:00 2001
From: Eltos <eltos@outlook.de>
Date: Mon, 12 Oct 2026 21:42:27 +0200
Subject: [PATCH 11/11] Localization

---
 PasteIntoFile.Core/PasteIntoFile.Core.csproj  |  11 ++
 .../Properties/Resources.Designer.cs          | 107 ++++++++++++++++++
 .../Properties/Resources.de.resx              |  33 ++++++
 .../Properties/Resources.es-es.resx           |  33 ++++++
 .../Properties/Resources.fr.resx              |  33 ++++++
 .../Properties/Resources.it.resx              |  33 ++++++
 .../Properties/Resources.ja-jp.resx           |  33 ++++++
 .../Properties/Resources.ko.resx              |  33 ++++++
 .../Properties/Resources.pt-br.resx           |  33 ++++++
 .../Properties/Resources.pt-pt.resx           |  33 ++++++
 PasteIntoFile.Core/Properties/Resources.resx  |  38 +++++++
 .../Properties/Resources.ru-ru.resx           |  33 ++++++
 .../Properties/Resources.uk-ua.resx           |  19 ++++
 .../Properties/Resources.zh-CN.resx           |  33 ++++++
 .../Properties/Resources.zh-TW.resx           |  33 ++++++
 PasteIntoFile.ShellExtension/AppendCommand.cs |   5 +-
 PasteIntoFile.ShellExtension/AppxManifest.xml |   8 +-
 .../BaseExplorerCommand.cs                    |  13 +--
 PasteIntoFile.ShellExtension/CopyCommand.cs   |  10 +-
 .../ExplorerCommandEnumerator.cs              |  60 ++++++++++
 .../FileGroupCommand.cs                       |  61 ++++++++++
 PasteIntoFile.ShellExtension/PasteCommand.cs  |   3 +-
 .../ReplaceCommand.cs                         |  10 +-
 PasteIntoFile/Properties/Resources.de.resx    |  18 ---
 PasteIntoFile/Properties/Resources.es-ES.resx |  18 ---
 PasteIntoFile/Properties/Resources.fr.resx    |  18 ---
 PasteIntoFile/Properties/Resources.it.resx    |  18 ---
 PasteIntoFile/Properties/Resources.ja-JP.resx |  18 ---
 PasteIntoFile/Properties/Resources.ko.resx    |  18 ---
 PasteIntoFile/Properties/Resources.pt-BR.resx |  18 ---
 PasteIntoFile/Properties/Resources.pt-PT.resx |  18 ---
 PasteIntoFile/Properties/Resources.resx       |  18 ---
 PasteIntoFile/Properties/Resources.ru-RU.resx |  18 ---
 PasteIntoFile/Properties/Resources.uk-UA.resx |   4 -
 PasteIntoFile/Properties/Resources.zh-CN.resx |  12 --
 PasteIntoFile/Properties/Resources.zh-TW.resx |  12 --
 PasteIntoFile/RegistryUtil.cs                 |  12 +-
 PasteIntoFile/Wizard.Designer.cs              |   6 +-
 38 files changed, 693 insertions(+), 241 deletions(-)
 create mode 100644 PasteIntoFile.Core/Properties/Resources.Designer.cs
 create mode 100644 PasteIntoFile.Core/Properties/Resources.de.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.es-es.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.fr.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.it.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.ja-jp.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.ko.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.pt-br.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.pt-pt.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.ru-ru.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.uk-ua.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.zh-CN.resx
 create mode 100644 PasteIntoFile.Core/Properties/Resources.zh-TW.resx
 create mode 100644 PasteIntoFile.ShellExtension/ExplorerCommandEnumerator.cs
 create mode 100644 PasteIntoFile.ShellExtension/FileGroupCommand.cs

diff --git a/PasteIntoFile.Core/PasteIntoFile.Core.csproj b/PasteIntoFile.Core/PasteIntoFile.Core.csproj
index a5317ee..b7f60bb 100644
--- a/PasteIntoFile.Core/PasteIntoFile.Core.csproj
+++ b/PasteIntoFile.Core/PasteIntoFile.Core.csproj
@@ -18,5 +18,16 @@
         </Compile>
         <PackageReference Include="PortableSettingsProvider" Version="0.2.5" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
+        <Compile Update="Properties\Resources.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Update="Properties\Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
     </ItemGroup>
 </Project>
diff --git a/PasteIntoFile.Core/Properties/Resources.Designer.cs b/PasteIntoFile.Core/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..734b04f
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.Designer.cs
@@ -0,0 +1,107 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PasteIntoFile.Core.Properties {
+    using System;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public Resources() {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PasteIntoFile.Core.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Paste into file.
+        /// </summary>
+        public static string str_contextentry {
+            get {
+                return ResourceManager.GetString("str_contextentry", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Append.
+        /// </summary>
+        public static string str_contextentry_append {
+            get {
+                return ResourceManager.GetString("str_contextentry_append", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Copy file content.
+        /// </summary>
+        public static string str_contextentry_copyfromfile {
+            get {
+                return ResourceManager.GetString("str_contextentry_copyfromfile", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Paste into this file.
+        /// </summary>
+        public static string str_contextentry_paste_into_existing_file {
+            get {
+                return ResourceManager.GetString("str_contextentry_paste_into_existing_file", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Replace.
+        /// </summary>
+        public static string str_contextentry_replace {
+            get {
+                return ResourceManager.GetString("str_contextentry_replace", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/PasteIntoFile.Core/Properties/Resources.de.resx b/PasteIntoFile.Core/Properties/Resources.de.resx
new file mode 100644
index 0000000..dc137cb
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.de.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Dateiinhalt kopieren</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Einfügen in diese Datei</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Einfügen als Datei</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Anfügen</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Ersetzen</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.es-es.resx b/PasteIntoFile.Core/Properties/Resources.es-es.resx
new file mode 100644
index 0000000..0220df3
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.es-es.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copiar contenido del archivo</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Pegar en este archivo</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Pegar en fichero</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Anexar</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Reemplazar</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.fr.resx b/PasteIntoFile.Core/Properties/Resources.fr.resx
new file mode 100644
index 0000000..0b3615f
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.fr.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copier le contenu du fichier</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Coller dans ce fichier</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Coller dans un fichier </value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Ajouter</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Remplacer</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.it.resx b/PasteIntoFile.Core/Properties/Resources.it.resx
new file mode 100644
index 0000000..b60db7e
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.it.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copia il contenuto del file</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Incolla in questo file</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Incolla nel file</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Aggiungi</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Sostituisci</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.ja-jp.resx b/PasteIntoFile.Core/Properties/Resources.ja-jp.resx
new file mode 100644
index 0000000..31c0b32
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.ja-jp.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>ファイルの内容をコピー</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>このファイルに貼り付け</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>ファイルに貼り付け</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>追記</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>置き換え</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.ko.resx b/PasteIntoFile.Core/Properties/Resources.ko.resx
new file mode 100644
index 0000000..b7080d2
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.ko.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>파일 내용 복사</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>이 파일에 붙여넣기</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>파일에 붙여넣기</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>추가</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>바꾸기</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.pt-br.resx b/PasteIntoFile.Core/Properties/Resources.pt-br.resx
new file mode 100644
index 0000000..652144d
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.pt-br.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copiar conteúdo do arquivo</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Colar nesse arquivo</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Colar no arquivo</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Acrescentar</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Substituir</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.pt-pt.resx b/PasteIntoFile.Core/Properties/Resources.pt-pt.resx
new file mode 100644
index 0000000..e7620a2
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.pt-pt.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copiar conteúdo do ficheiro</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Colar neste ficheiro</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Colar no ficheiro</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Acrescentar</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Substituir</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.resx b/PasteIntoFile.Core/Properties/Resources.resx
new file mode 100644
index 0000000..7d9a4ac
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.resx
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Copy file content</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Paste into this file</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Paste into file</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Append</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Replace</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.ru-ru.resx b/PasteIntoFile.Core/Properties/Resources.ru-ru.resx
new file mode 100644
index 0000000..541a3c8
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.ru-ru.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>Копировать содержимое файла</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>Вставить в этот файл</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Вставить в файл</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>Дополнить</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>Заменить</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.uk-ua.resx b/PasteIntoFile.Core/Properties/Resources.uk-ua.resx
new file mode 100644
index 0000000..ae40532
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.uk-ua.resx
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Вставити до файлу</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.zh-CN.resx b/PasteIntoFile.Core/Properties/Resources.zh-CN.resx
new file mode 100644
index 0000000..24a58d2
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.zh-CN.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>复制文件内容</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>粘贴到此文件中</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Paste Into File</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>追加</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>替换</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.Core/Properties/Resources.zh-TW.resx b/PasteIntoFile.Core/Properties/Resources.zh-TW.resx
new file mode 100644
index 0000000..f895455
--- /dev/null
+++ b/PasteIntoFile.Core/Properties/Resources.zh-TW.resx
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>1.3</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="str_contextentry_copyfromfile" xml:space="preserve">
+    <value>複製檔案內容</value>
+    <comment>Context menu entry for copying
+</comment>
+  </data>
+  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
+    <value>貼入此檔案</value>
+  </data>
+  <data name="str_contextentry" xml:space="preserve">
+    <value>Paste Into File</value>
+    <comment>Context menu entry for pasting</comment>
+  </data>
+  <data name="str_contextentry_append" xml:space="preserve">
+    <value>追加</value>
+  </data>
+  <data name="str_contextentry_replace" xml:space="preserve">
+    <value>取代</value>
+  </data>
+</root>
diff --git a/PasteIntoFile.ShellExtension/AppendCommand.cs b/PasteIntoFile.ShellExtension/AppendCommand.cs
index 2f19799..20d1fae 100644
--- a/PasteIntoFile.ShellExtension/AppendCommand.cs
+++ b/PasteIntoFile.ShellExtension/AppendCommand.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using PasteIntoFile.Core.Properties;
 
 namespace PasteIntoFileShellExtension;
 
@@ -12,7 +13,7 @@ public sealed class AppendCommand : BaseExplorerCommand {
     public override string Clsid => Clsids.AppendCommand;
 
     public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Append);
+        ppszName = Marshal.StringToCoTaskMemUni(Resources.str_contextentry_append);
         return HResult.S_OK;
     }
 
@@ -42,7 +43,7 @@ private static EXPCMDSTATE CheckSingleFileSelectedWithAppendSupport(IShellItemAr
                     if (shellItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pathPtr) == HResult.S_OK && pathPtr != IntPtr.Zero) {
                         var path = Marshal.PtrToStringUni(pathPtr);
                         Marshal.FreeCoTaskMem(pathPtr);
-                        if (!string.IsNullOrEmpty(path) && File.Exists(path) && IsAppendSupported(path)) {
+                        if (!string.IsNullOrEmpty(path) && IsAppendSupported(path)) {
                             return EXPCMDSTATE.ECS_ENABLED;
                         }
                     }
diff --git a/PasteIntoFile.ShellExtension/AppxManifest.xml b/PasteIntoFile.ShellExtension/AppxManifest.xml
index 85de774..db8507a 100644
--- a/PasteIntoFile.ShellExtension/AppxManifest.xml
+++ b/PasteIntoFile.ShellExtension/AppxManifest.xml
@@ -18,9 +18,7 @@
                     <com:ComServer>
                         <com:SurrogateServer DisplayName="PasteIntoFile Shell Extension">
                             <com:Class Id="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="41C9024D-4DCC-4CFE-B19B-C267B2525F63" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="90220591-C089-4812-AF4B-510694581EF4" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
-                            <com:Class Id="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
+                            <com:Class Id="109EFE3F-786B-4DFA-B639-4B673C05B932" Path="PasteIntoFile.ShellExtension.comhost.dll" ThreadingModel="Both" />
                         </com:SurrogateServer>
                     </com:ComServer>
                 </com:Extension>
@@ -33,9 +31,7 @@
                             <desktop5:Verb Id="PasteIntoFilePasteDirectoryBackground" Clsid="A6F24F95-0E3D-4A37-8E58-1F05D66E76A5" />
                         </desktop5:ItemType>
                         <desktop5:ItemType Type="*">
-                            <desktop5:Verb Id="PasteIntoFileCopy" Clsid="41C9024D-4DCC-4CFE-B19B-C267B2525F63" />
-                            <desktop5:Verb Id="PasteIntoFileReplace" Clsid="90220591-C089-4812-AF4B-510694581EF4" />
-                            <desktop5:Verb Id="PasteIntoFileAppend" Clsid="668F5257-E4B7-4DE7-84AE-B1AA710F38F5" />
+                            <desktop5:Verb Id="PasteIntoFile" Clsid="109EFE3F-786B-4DFA-B639-4B673C05B932" />
                         </desktop5:ItemType>
                     </desktop4:FileExplorerContextMenus>
                 </desktop4:Extension>
diff --git a/PasteIntoFile.ShellExtension/BaseExplorerCommand.cs b/PasteIntoFile.ShellExtension/BaseExplorerCommand.cs
index 7c8899e..4b7716f 100644
--- a/PasteIntoFile.ShellExtension/BaseExplorerCommand.cs
+++ b/PasteIntoFile.ShellExtension/BaseExplorerCommand.cs
@@ -6,15 +6,6 @@
 
 namespace PasteIntoFileShellExtension;
 
-// Shared title constants — match the localized strings from the main app's Resources.
-// Since the shell extension runs in a surrogate process, we use hardcoded English titles
-// that match the default (English) resource strings.
-static class Titles {
-    public const string Paste = "PasteIntoFile";
-    public const string Copy = "Copy file contents";
-    public const string Replace = "Paste into (Replace)";
-    public const string Append = "Paste into (Append)";
-}
 
 // Shared COM class IDs — must match AppxManifest.xml registrations
 static class Clsids {
@@ -182,12 +173,12 @@ public int GetCanonicalName(out Guid pguidCommandName) {
 
     public abstract int Invoke(IShellItemArray psiItemArray, IntPtr pbc);
 
-    public int GetFlags(out EXPCMDFLAGS pFlags) {
+    public virtual int GetFlags(out EXPCMDFLAGS pFlags) {
         pFlags = EXPCMDFLAGS.ECF_DEFAULT;
         return HResult.S_OK;
     }
 
-    public int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+    public virtual int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
         ppEnum = null!;
         return HResult.E_NOTIMPL;
     }
diff --git a/PasteIntoFile.ShellExtension/CopyCommand.cs b/PasteIntoFile.ShellExtension/CopyCommand.cs
index bc65457..91fbd6c 100644
--- a/PasteIntoFile.ShellExtension/CopyCommand.cs
+++ b/PasteIntoFile.ShellExtension/CopyCommand.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using PasteIntoFile.Core.Properties;
 
 namespace PasteIntoFileShellExtension;
 
@@ -12,12 +13,17 @@ public sealed class CopyCommand : BaseExplorerCommand {
     public override string Clsid => Clsids.CopyCommand;
 
     public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Copy);
+        ppszName = Marshal.StringToCoTaskMemUni(Resources.str_contextentry_copyfromfile);
         return HResult.S_OK;
     }
 
     public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = CheckSingleFileSelected(psiItemArray);
+        // Show if exactly one item is selected
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            pCmdState = EXPCMDSTATE.ECS_ENABLED;
+        } else {
+            pCmdState = EXPCMDSTATE.ECS_HIDDEN;
+        }
         return HResult.S_OK;
     }
 
diff --git a/PasteIntoFile.ShellExtension/ExplorerCommandEnumerator.cs b/PasteIntoFile.ShellExtension/ExplorerCommandEnumerator.cs
new file mode 100644
index 0000000..bc87eae
--- /dev/null
+++ b/PasteIntoFile.ShellExtension/ExplorerCommandEnumerator.cs
@@ -0,0 +1,60 @@
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace PasteIntoFileShellExtension;
+
+/// <summary>
+/// COM-visible enumerator for IExplorerCommand subcommands.
+/// Wraps a list of IExplorerCommand instances and exposes them via IEnumExplorerCommand.
+/// </summary>
+[ComVisible(true)]
+[Guid("B2E4F8A1-3D5C-4B9E-A7F1-9C8D6E5A4B3C")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IEnumExplorerCommand))]
+public class ExplorerCommandEnumerator : IEnumExplorerCommand {
+    private readonly IEnumerator<IExplorerCommand> _enumerator;
+    private IExplorerCommand? _current;
+
+    public ExplorerCommandEnumerator(IList<IExplorerCommand> commands) {
+        _enumerator = commands.GetEnumerator();
+    }
+
+    public int Next(uint celt, out IExplorerCommand rgelt, out uint pceltFetched) {
+        rgelt = null!;
+        pceltFetched = 0;
+
+        if (celt == 0) {
+            return HResult.S_OK;
+        }
+
+        if (_enumerator.MoveNext()) {
+            _current = (IExplorerCommand)_enumerator.Current;
+            rgelt = _current;
+            pceltFetched = 1;
+            return HResult.S_OK;
+        }
+
+        return HResult.S_FALSE;
+    }
+
+    public int Skip(uint celt) {
+        for (uint i = 0; i < celt; i++) {
+            if (!_enumerator.MoveNext()) {
+                return HResult.S_FALSE;
+            }
+        }
+        return HResult.S_OK;
+    }
+
+    public int Reset() {
+        _enumerator.Reset();
+        _current = null;
+        return HResult.S_OK;
+    }
+
+    public int Clone(out IEnumExplorerCommand ppEnum) {
+        // Clone is not supported; return E_NOTIMPL
+        ppEnum = null!;
+        return HResult.E_NOTIMPL;
+    }
+}
diff --git a/PasteIntoFile.ShellExtension/FileGroupCommand.cs b/PasteIntoFile.ShellExtension/FileGroupCommand.cs
new file mode 100644
index 0000000..46da7ae
--- /dev/null
+++ b/PasteIntoFile.ShellExtension/FileGroupCommand.cs
@@ -0,0 +1,61 @@
+using System.Runtime.InteropServices;
+using PasteIntoFile.Core.Properties;
+
+namespace PasteIntoFileShellExtension;
+
+// Shared COM class ID for the file group command
+static class FileGroupClsid {
+    public const string Value = "109EFE3F-786B-4DFA-B639-4B673C05B932";
+}
+
+/// <summary>
+/// Parent group command for file context menus.
+/// Displays "Paste Into File" with a right-arrow submenu containing Copy, Replace, and Append.
+/// </summary>
+[ComVisible(true)]
+[Guid(FileGroupClsid.Value)]
+[ProgId("PasteIntoFile.ShellExtension.FileGroupCommand")]
+[ClassInterface(ClassInterfaceType.None)]
+[ComDefaultInterface(typeof(IExplorerCommand))]
+public sealed class FileGroupCommand : BaseExplorerCommand {
+
+    public override string Clsid => FileGroupClsid.Value;
+
+    public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
+        ppszName = Marshal.StringToCoTaskMemUni(Resources.str_contextentry);
+        return HResult.S_OK;
+    }
+
+    public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
+        // Show the group if exactly one item is selected
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            pCmdState = EXPCMDSTATE.ECS_ENABLED;
+        } else {
+            pCmdState = EXPCMDSTATE.ECS_HIDDEN;
+        }
+        return HResult.S_OK;
+    }
+
+    public override int Invoke(IShellItemArray psiItemArray, IntPtr pbc) {
+        // The group itself is not invokable; only its subcommands are.
+        return HResult.E_NOTIMPL;
+    }
+
+    public override int GetFlags(out EXPCMDFLAGS pFlags) {
+        // Mark this command as having subcommands so Explorer shows the right-arrow indicator
+        pFlags = EXPCMDFLAGS.ECF_HASSUBCOMMANDS;
+        return HResult.S_OK;
+    }
+
+    public override int EnumSubCommands(out IEnumExplorerCommand ppEnum) {
+        // Return the subcommands in the desired order: Copy, Replace, Append
+        var subCommands = new List<IExplorerCommand> {
+            new ReplaceCommand(),
+            new AppendCommand(),
+            new CopyCommand()
+        };
+
+        ppEnum = new ExplorerCommandEnumerator(subCommands);
+        return HResult.S_OK;
+    }
+}
diff --git a/PasteIntoFile.ShellExtension/PasteCommand.cs b/PasteIntoFile.ShellExtension/PasteCommand.cs
index e1deacd..f3b0c76 100644
--- a/PasteIntoFile.ShellExtension/PasteCommand.cs
+++ b/PasteIntoFile.ShellExtension/PasteCommand.cs
@@ -1,5 +1,6 @@
 using System.Runtime.InteropServices;
 using PasteIntoFile.Core;
+using PasteIntoFile.Core.Properties;
 
 namespace PasteIntoFileShellExtension;
 
@@ -17,7 +18,7 @@ public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName)
         // while avoiding expensive file I/O on slow storage.
         SettingsUtil.ReloadIfChanged(Settings.Default);
 
-        var title = Titles.Paste;
+        var title = Resources.str_contextentry;
         if (!Settings.Default.autoSave) {
             title += "…";  // opens a dialog
         }
diff --git a/PasteIntoFile.ShellExtension/ReplaceCommand.cs b/PasteIntoFile.ShellExtension/ReplaceCommand.cs
index 1ea42d8..e57a823 100644
--- a/PasteIntoFile.ShellExtension/ReplaceCommand.cs
+++ b/PasteIntoFile.ShellExtension/ReplaceCommand.cs
@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using PasteIntoFile.Core.Properties;
 
 namespace PasteIntoFileShellExtension;
 
@@ -12,12 +13,17 @@ public sealed class ReplaceCommand : BaseExplorerCommand {
     public override string Clsid => Clsids.ReplaceCommand;
 
     public override int GetTitle(IShellItemArray psiItemArray, out IntPtr ppszName) {
-        ppszName = Marshal.StringToCoTaskMemUni(Titles.Replace);
+        ppszName = Marshal.StringToCoTaskMemUni(Resources.str_contextentry_replace);
         return HResult.S_OK;
     }
 
     public override int GetState(IShellItemArray psiItemArray, bool fOkToBeSlow, out EXPCMDSTATE pCmdState) {
-        pCmdState = CheckSingleFileSelected(psiItemArray);
+        // Show if exactly one item is selected
+        if (psiItemArray != null && psiItemArray.GetCount(out var count) == HResult.S_OK && count == 1) {
+            pCmdState = EXPCMDSTATE.ECS_ENABLED;
+        } else {
+            pCmdState = EXPCMDSTATE.ECS_HIDDEN;
+        }
         return HResult.S_OK;
     }
 
diff --git a/PasteIntoFile/Properties/Resources.de.resx b/PasteIntoFile/Properties/Resources.de.resx
index ecc7892..85773f9 100644
--- a/PasteIntoFile/Properties/Resources.de.resx
+++ b/PasteIntoFile/Properties/Resources.de.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Bitte die Anwendung als Administrator ausführen!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Einfügen als Datei</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Speicherort auswählen</value>
     <comment>str_select_folder
@@ -188,11 +184,6 @@ Aktuellen Inhalt der Zwischenablage jetzt speichern?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Ungültiges Zeichen: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Dateiinhalt kopieren</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>Die Datei {0} enthält Daten eines unbekannten Formats, die nicht in die Zwischenablage kopiert werden können.</value>
   </data>
@@ -298,15 +289,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Hinzufügen zu bestehender Datei wird für "{0}" nicht unterstützt.</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Ersetzen</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Einfügen in diese Datei</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Anfügen</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>Die Ordner-Vorlage wird bei gedrückter STRG Taste an den Zielordner angefügt. Absolute Pfade sind auch möglich und ersetzten den Zielordner.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.es-ES.resx b/PasteIntoFile/Properties/Resources.es-ES.resx
index 822c35f..7ae2b6c 100644
--- a/PasteIntoFile/Properties/Resources.es-ES.resx
+++ b/PasteIntoFile/Properties/Resources.es-ES.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>¡Por favor, ejecute la aplicación como administrador!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Pegar en fichero</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Seleccione una carpeta para guardar este archivo</value>
     <comment>str_select_folder
@@ -188,11 +184,6 @@ Para más detalles sobre el formato especificados &lt;a&gt;haga clic aquí&lt;/a
   <data name="str_invalid_character" xml:space="preserve">
     <value>Carácter no válido: '{0}'</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copiar contenido del archivo</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>El archivo {0} contiene datos de formato desconocido que no pueden copiarse al portapapeles.</value>
   </data>
@@ -291,15 +282,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Adjuntar no está soportado para la extensión "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Reemplazar</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Pegar en este archivo</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Anexar</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>La plantilla de subcarpeta se añade a la ruta de la carpeta cuando se ejecuta Pegar en el archivo con la tecla CTRL presionada. Las rutas absolutas también están soportadas y reemplazarán la carpeta.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.fr.resx b/PasteIntoFile/Properties/Resources.fr.resx
index 298ccec..0778103 100644
--- a/PasteIntoFile/Properties/Resources.fr.resx
+++ b/PasteIntoFile/Properties/Resources.fr.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Veuillez exécuter l'application en tant qu'administrateur !</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Coller dans un fichier </value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Sélectionnez un dossier pour enregistrer ce fichier</value>
     <comment>str_select_folder
@@ -188,11 +184,6 @@ Enregistrer le contenu actuel du presse-papiers maintenant ?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Caractère invalide : {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copier le contenu du fichier</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>Le fichier {0} contient des données de format inconnu qui ne peuvent pas être copiées dans le presse-papiers.</value>
   </data>
@@ -297,15 +288,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>L'ajout n'est pas pris en charge pour l'extension "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Remplacer</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Coller dans ce fichier</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Ajouter</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>Le modèle de dossier est ajouté au chemin du dossier lors de l'exécution de Coller dans un fichier avec la touche CTRL pressée. Les chemins absolus sont également pris en charge et remplaceront le dossier.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.it.resx b/PasteIntoFile/Properties/Resources.it.resx
index ad7ec36..16f93ee 100644
--- a/PasteIntoFile/Properties/Resources.it.resx
+++ b/PasteIntoFile/Properties/Resources.it.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Perfavore avvia l'app come amministratore!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Incolla nel file</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Seleziona una cartella per salvare questo file</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Salvare ora i contenuti degli appunti correnti?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Carattere non valido: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copia il contenuto del file</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>Il file {0} contiene dati di formato sconosciuto che non possono essere copiati negli appunti.</value>
   </data>
@@ -292,15 +283,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>L'aggiunta non è supportata per l'estensione "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Sostituisci</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Incolla in questo file</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Aggiungi</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>Il modello di cartella viene aggiunto al percorso della cartella quando si esegue Incolla nel file con il tasto CTRL premuto. Anche i percorsi assoluti sono supportati e sostituiranno la cartella.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.ja-JP.resx b/PasteIntoFile/Properties/Resources.ja-JP.resx
index f897b30..3de3b7f 100644
--- a/PasteIntoFile/Properties/Resources.ja-JP.resx
+++ b/PasteIntoFile/Properties/Resources.ja-JP.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>管理者としてアプリケーションを実行してください！</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>ファイルに貼り付け</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>このファイルを保存するフォルダーを選択してください</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Tooltip</comment>
   <data name="str_invalid_character" xml:space="preserve">
     <value>無効な文字: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>ファイルの内容をコピー</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>ファイル {0} は、クリップボードにコピーできない不明なフォーマットのデータを含んでいます。</value>
   </data>
@@ -292,15 +283,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>拡張機能「{0}」の追加はサポートされていません。</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>置き換え</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>このファイルに貼り付け</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>追記</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>CTRLキーを押しながら Paste Into File を実行すると、サブフォルダーテンプレートがフォルダーパスに追加されます。 絶対パスもサポートされ、フォルダーを置き換えます。</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.ko.resx b/PasteIntoFile/Properties/Resources.ko.resx
index 0dffdf7..2843062 100644
--- a/PasteIntoFile/Properties/Resources.ko.resx
+++ b/PasteIntoFile/Properties/Resources.ko.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>응용 프로그램을 관리자로 실행해 주세요!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>파일에 붙여넣기</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>이 파일을 저장할 폴더 선택</value>
     <comment>str_select_folder
@@ -188,11 +184,6 @@ Tooltip</comment>
   <data name="str_invalid_character" xml:space="preserve">
     <value>잘못된 문자: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>파일 내용 복사</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>파일 {0}에는 클립보드에 복사할 수 없는 형식이 알려지지 않은 데이터가 포함되어 있습니다.</value>
   </data>
@@ -298,15 +289,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>확장자 "{0}"에서는 추가 기능이 지원되지 않습니다.</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>바꾸기</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>이 파일에 붙여넣기</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>추가</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>하위 폴더 템플릿은 CTRL 키를 눌러 파일에 붙여넣기를 실행할 때 폴더 경로에 추가됩니다. 절대 경로도 지원되며 폴더를 대체합니다.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.pt-BR.resx b/PasteIntoFile/Properties/Resources.pt-BR.resx
index 3a4e2b5..1a88646 100644
--- a/PasteIntoFile/Properties/Resources.pt-BR.resx
+++ b/PasteIntoFile/Properties/Resources.pt-BR.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Por favor, execute o aplicativo como administrador!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Colar no arquivo</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Selecione uma pasta para salvar este arquivo</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Salvar conteúdos atuais da área de transferência?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Carácter inválido: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copiar conteúdo do arquivo</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>O arquivo {0} contém dados de um formato desconhecido em que não pode ser copiado para a área de transferência.</value>
   </data>
@@ -292,15 +283,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Acrescentar não é suportado para a extensão "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Substituir</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Colar nesse arquivo</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Acrescentar</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>O modelo da subpasta é acrescentada para o caminho da pasta ao executar Paste Into File quando pressionar a tecla CTRL. Caminhos absolutos também são compatíveis e vão substituir a pasta.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.pt-PT.resx b/PasteIntoFile/Properties/Resources.pt-PT.resx
index 43bf453..06c9167 100644
--- a/PasteIntoFile/Properties/Resources.pt-PT.resx
+++ b/PasteIntoFile/Properties/Resources.pt-PT.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Por favor, execute a aplicação como administrador!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Colar no ficheiro</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Selecione uma pasta para salvar este ficheiro</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Guardar atuais conteúdos da área de transferência?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Carácter inválido: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copiar conteúdo do ficheiro</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>O ficheiro {0} contém dados de formato desconhecido que não pode ser copiado para a área de transferência</value>
   </data>
@@ -292,15 +283,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Impossível acrescentar para a extensão "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Substituir</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Colar neste ficheiro</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Acrescentar</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>O modelo de pasta é acrescentado ao caminho da pasta ao executar Paste Into File quando premir a tecla CTRL. Caminhos absolutos são suportados e irão substituir a pasta.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.resx b/PasteIntoFile/Properties/Resources.resx
index bc00a9d..4375bad 100644
--- a/PasteIntoFile/Properties/Resources.resx
+++ b/PasteIntoFile/Properties/Resources.resx
@@ -89,10 +89,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Please run the application as administrator!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Paste into file</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_contextentry_win11" xml:space="preserve">
     <value>Use new Windows 11 context menu</value>
   </data>
@@ -203,11 +199,6 @@ Save current clipboard contents now?</value>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Invalid character: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Copy file content</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>The file {0} contains data of unknown format which cannot be copied to the clipboard.</value>
   </data>
@@ -313,15 +304,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Appending is not supported for extension "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Replace</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Paste into this file</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Append</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>The folder template is appended to the folder path when executing Paste Into File with pressed CTRL key. Absolute paths are also supported and will replace the folder.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.ru-RU.resx b/PasteIntoFile/Properties/Resources.ru-RU.resx
index b75201b..1407da9 100644
--- a/PasteIntoFile/Properties/Resources.ru-RU.resx
+++ b/PasteIntoFile/Properties/Resources.ru-RU.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>Пожалуйста, запустите приложение от имени администратора!</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Вставить в файл</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Выберите папку для сохранения данного файла</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Tooltip</comment>
   <data name="str_invalid_character" xml:space="preserve">
     <value>Недопустимый символ: {0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>Копировать содержимое файла</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>Файл {0} содержит данные неизвестного формата, которые невозможно скопировать в буфер обмена.</value>
   </data>
@@ -291,15 +282,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_append_not_supported" xml:space="preserve">
     <value>Дополнение содержимого не поддерживается для файла с расширением "{0}".</value>
   </data>
-  <data name="str_replace" xml:space="preserve">
-    <value>Заменить</value>
-  </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>Вставить в этот файл</value>
-  </data>
-  <data name="str_append" xml:space="preserve">
-    <value>Дополнить</value>
-  </data>
   <data name="str_template_edit_subfolder_info" xml:space="preserve">
     <value>Шаблон вложенной папки добавляется к пути к папке при выполнении Paste Into File с нажатой клавишей CTRL. Также поддерживаются абсолютные пути, которые заменяют папку.</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.uk-UA.resx b/PasteIntoFile/Properties/Resources.uk-UA.resx
index 644e389..da41fde 100644
--- a/PasteIntoFile/Properties/Resources.uk-UA.resx
+++ b/PasteIntoFile/Properties/Resources.uk-UA.resx
@@ -81,10 +81,6 @@
     <value>Папка</value>
     <comment>Folder path location to save file into</comment>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Вставити до файлу</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>Виберіть папку для збереження цього файлу</value>
     <comment>str_select_folder
diff --git a/PasteIntoFile/Properties/Resources.zh-CN.resx b/PasteIntoFile/Properties/Resources.zh-CN.resx
index c2694fa..ecc460d 100644
--- a/PasteIntoFile/Properties/Resources.zh-CN.resx
+++ b/PasteIntoFile/Properties/Resources.zh-CN.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>请以管理员身份运行此应用程序！</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>Paste Into File</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>选择保存此文件的文件夹</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Tooltip</comment>
   <data name="str_invalid_character" xml:space="preserve">
     <value>无效字符：{0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>复制文件内容</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>文件 {0} 包含未知格式的数据，无法复制到剪贴板。</value>
   </data>
@@ -302,9 +293,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_replace" xml:space="preserve">
     <value>替换</value>
   </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>粘贴到此文件中</value>
-  </data>
   <data name="str_append" xml:space="preserve">
     <value>追加</value>
   </data>
diff --git a/PasteIntoFile/Properties/Resources.zh-TW.resx b/PasteIntoFile/Properties/Resources.zh-TW.resx
index bce0ac9..0c86541 100644
--- a/PasteIntoFile/Properties/Resources.zh-TW.resx
+++ b/PasteIntoFile/Properties/Resources.zh-TW.resx
@@ -84,10 +84,6 @@
   <data name="str_message_run_as_admin" xml:space="preserve">
     <value>請以管理員模式執行本應用程式！</value>
   </data>
-  <data name="str_contextentry" xml:space="preserve">
-    <value>貼入檔案</value>
-    <comment>Context menu entry for pasting</comment>
-  </data>
   <data name="str_select_folder" xml:space="preserve">
     <value>選擇資料夾來儲存此檔案</value>
     <comment>str_select_folder
@@ -189,11 +185,6 @@ Tooltip</comment>
   <data name="str_invalid_character" xml:space="preserve">
     <value>無效字元：{0}</value>
   </data>
-  <data name="str_contextentry_copyfromfile" xml:space="preserve">
-    <value>複製檔案內容</value>
-    <comment>Context menu entry for copying
-</comment>
-  </data>
   <data name="str_copy_failed_unknown_format" xml:space="preserve">
     <value>檔案 {0} 內含未知的資料格式而無法複製到剪貼簿。</value>
   </data>
@@ -294,9 +285,6 @@ Allows to keep application window always on top (in foreground of other windows)
   <data name="str_replace" xml:space="preserve">
     <value>取代</value>
   </data>
-  <data name="str_contextentry_paste_into_existing_file" xml:space="preserve">
-    <value>貼入此檔案</value>
-  </data>
   <data name="str_append" xml:space="preserve">
     <value>貼入尾端</value>
   </data>
diff --git a/PasteIntoFile/RegistryUtil.cs b/PasteIntoFile/RegistryUtil.cs
index d3dfdf3..31c1ead 100644
--- a/PasteIntoFile/RegistryUtil.cs
+++ b/PasteIntoFile/RegistryUtil.cs
@@ -34,13 +34,13 @@ public void Register(RegistryKey key) {
         public static readonly ContextMenuEntryPaste ContextMenuPaste = new ContextMenuEntryPaste();
         public class ContextMenuEntryPaste : ContextMenuEntry {
             public ContextMenuEntryPaste() : base("Directory", "PasteIntoFile") { }
-            protected override Command Command => new Command(Resources.str_contextentry, "paste \"%V\"", () => !Settings.Default.autoSave);
+            protected override Command Command => new Command(Core.Properties.Resources.str_contextentry, "paste \"%V\"", () => !Settings.Default.autoSave);
         }
 
         public static readonly ContextMenuEntryCopy ContextMenuCopy = new ContextMenuEntryCopy();
         public class ContextMenuEntryCopy : ContextMenuEntry {
             public ContextMenuEntryCopy() : base("*", "PasteIntoFile") { }
-            protected override Command Command => new Command(Resources.str_contextentry_copyfromfile, "copy \"%V\"");
+            protected override Command Command => new Command(Core.Properties.Resources.str_contextentry_copyfromfile, "copy \"%V\"");
         }
 
         public static readonly ContextMenuEntryReplace ContextMenuReplace = new ContextMenuEntryReplace();
@@ -48,7 +48,7 @@ public class ContextMenuEntryReplace : ContextMenuEntry {
             public ContextMenuEntryReplace() : base("*", "PasteIntoFile_replace") { }
             protected override string AppliesTo() => APPEND_NOT_SUPPORTED;
             protected override Command Command => new Command(
-                Resources.str_contextentry_paste_into_existing_file + " (" + Resources.str_replace + ")",
+                Core.Properties.Resources.str_contextentry_paste_into_existing_file + " (" + Core.Properties.Resources.str_contextentry_replace + ")",
                 "paste --overwrite=true --directory=\"%w\" --filename=\"%V\" --autosave=true"
             );
             public override void Register() {
@@ -63,10 +63,10 @@ public override void UnRegister() {
         private class ContextMenuEntryReplaceAppend : ContextMenuEntry {
             public ContextMenuEntryReplaceAppend() : base("*", "PasteIntoFile_replace_append") { }
             protected override string AppliesTo() => "NOT ( " + APPEND_NOT_SUPPORTED + " )";
-            protected override string Title => Resources.str_contextentry_paste_into_existing_file;
+            protected override string Title => Core.Properties.Resources.str_contextentry_paste_into_existing_file;
             protected override Command[] SubCommands => new[]{
-                new Command(Resources.str_replace, "paste --overwrite=true --directory=\"%w\" --filename=\"%V\" --autosave=true"),
-                new Command(Resources.str_append, "paste --append --directory=\"%w\" --filename=\"%V\" --autosave=true")
+                new Command(Core.Properties.Resources.str_contextentry_replace, "paste --overwrite=true --directory=\"%w\" --filename=\"%V\" --autosave=true"),
+                new Command(Core.Properties.Resources.str_contextentry_append, "paste --append --directory=\"%w\" --filename=\"%V\" --autosave=true")
             };
         }
         // for file types that are known not to support appending, show an entry without subcommands instead
diff --git a/PasteIntoFile/Wizard.Designer.cs b/PasteIntoFile/Wizard.Designer.cs
index a93980f..398edef 100644
--- a/PasteIntoFile/Wizard.Designer.cs
+++ b/PasteIntoFile/Wizard.Designer.cs
@@ -213,7 +213,7 @@ private void InitializeComponent() {
             this.contextEntryCheckBoxPaste.Name = "contextEntryCheckBoxPaste";
             this.contextEntryCheckBoxPaste.Size = new System.Drawing.Size(288, 24);
             this.contextEntryCheckBoxPaste.TabIndex = 1;
-            this.contextEntryCheckBoxPaste.Text = Resources.str_contextentry;
+            this.contextEntryCheckBoxPaste.Text = Core.Properties.Resources.str_contextentry;
             this.contextEntryCheckBoxPaste.UseVisualStyleBackColor = true;
             this.contextEntryCheckBoxPaste.CheckedChanged += new System.EventHandler(this.ChkContextEntry_CheckedChanged);
             //
@@ -227,7 +227,7 @@ private void InitializeComponent() {
             this.contextEntryCheckBoxCopy.Name = "contextEntryCheckBoxCopy";
             this.contextEntryCheckBoxCopy.Size = new System.Drawing.Size(288, 24);
             this.contextEntryCheckBoxCopy.TabIndex = 2;
-            this.contextEntryCheckBoxCopy.Text = Resources.str_contextentry_copyfromfile;
+            this.contextEntryCheckBoxCopy.Text = Core.Properties.Resources.str_contextentry_copyfromfile;
             this.contextEntryCheckBoxCopy.UseVisualStyleBackColor = true;
             this.contextEntryCheckBoxCopy.CheckedChanged += new System.EventHandler(this.ChkContextEntry_CheckedChanged);
             //
@@ -241,7 +241,7 @@ private void InitializeComponent() {
             this.contextEntryCheckBoxReplace.Name = "contextEntryCheckBoxReplace";
             this.contextEntryCheckBoxReplace.Size = new System.Drawing.Size(288, 24);
             this.contextEntryCheckBoxReplace.TabIndex = 3;
-            this.contextEntryCheckBoxReplace.Text = Resources.str_contextentry_paste_into_existing_file + " (" + Resources.str_replace + "/" + Resources.str_append + ")";
+            this.contextEntryCheckBoxReplace.Text = Core.Properties.Resources.str_contextentry_paste_into_existing_file + " (" + Core.Properties.Resources.str_contextentry_replace + "/" + Core.Properties.Resources.str_contextentry_append + ")";
             this.contextEntryCheckBoxReplace.UseVisualStyleBackColor = true;
             this.contextEntryCheckBoxReplace.CheckedChanged += new System.EventHandler(this.ChkContextEntry_CheckedChanged);
             //