diff --git a/pending/i2p.xml b/pending/i2p.xml
index 22d0c71..ad2959f 100644
--- a/pending/i2p.xml
+++ b/pending/i2p.xml
@@ -22,42 +22,66 @@
     @url http://www.i2p-projekt.de/en/
     @os Windows, Linux
     @cleanerversion v0.4.5
-    @cleanerdate 2019-03-14
-    @cleanerby https://github.com/Tobias-B-Besemer
+    @cleanerdate 2019-03-21
+    @cleanerby https://github.com/Tobias-B-Besemer (2019-02-18 - 2019-03-21)
     @tested ok v0.9.38, Windows 7
     @testeddate 2019-03-10 (... with an old version of the cleaner!)
     @testedby https://github.com/Tobias-B-Besemer
-    @note No Linux Support here, yet! Will do this later! Tobias.
+    @note No Linux support here, yet! Will do this later! Tobias.
 
 -->
 <cleaner id="i2p" os="windows">
   <label>I2P</label>
   <description>Network layer client</description>
-  <var name="profile">
-    <value search="glob" os="windows">%AppData%\I2P</value>
-    <!-- No Linux Support here, yet! Will do this later! Tobias.
+  <var name="Profile">
+    <value os="windows">%AppData%\I2P</value>
+    <!-- No Linux support here, yet! Will do this later! Tobias.
     -> Don't forget to remove os="windows"!
-    <value search="glob" os="linux">~/.i2p</value>
+    <value os="linux">~/.i2p</value>
+    -->
+  </var>
+  <var name="ProgramFiles">
+    <!--
+    Windows itself changes %ProgramFiles% for 32-bit processes running in a 64-bit operating system as documented here:
+    https://docs.microsoft.com/en-us/windows/desktop/winprog64/wow64-implementation-details
+    ...so we used "%SystemDrive%\Program Files\" & "%SystemDrive%\Program Files (x86)\"...
+    <value os="windows">%SystemDrive%\Program Files\[ProgramName]</value>
+    <value os="windows">%SystemDrive%\Program Files (x86)\[ProgramName]</value>
+    ...but %ProgramFiles% & %ProgramFiles(x86)% don't need to be on %SystemDrive% !!!
+    So we use: -->
+    <value os="windows">%ProgramW6432%\i2p</value>
+    <!-- ...that BleachBit as 32-bit program can find "\Program Files\i2p" and... -->
+    <value os="windows">%ProgramFiles(x86)%\i2p</value>
+    <!-- ...that BleachBit can find "\Program Files (x86)\i2p" and... -->
+    <value os="windows">%ProgramFiles%\i2p</value>
+    <!-- ...that BleachBit can find "\Program Files\i2p" on a x86 system...
+    ...and later, as 64-bit program, "\Program Files\i2p" (x64)!
+    So all cases solved! ;-) Tobias. -->
+    <!--
+    Linux $$ProgramFiles$$ not yet figured out! I will do this later! Tobias.
+    Don't forget to remove os="windows" !!!
+    <value os="linux">~/.i2p</value>
     -->
   </var>
   <var name="temp-folder">
-    <value search="glob" os="windows">%Temp%</value>
+    <value os="windows">%Temp%</value>
     <!-- No Linux Support here, yet! Will do this later! Tobias.
     -> Don't forget to remove os="windows"!
-    <value search="glob" os="linux">~/.temp</value>
+    <value os="linux">~/.temp</value>
     -->
   </var>
   <option id="logs">
     <label>Logs</label>
     <description>Delete the logs</description>
-    <action command="delete" search="walk.files" path="$$profile$$\logs\"/>
-    <action command="delete" search="file" path="$$profile$$\eventlog.txt"/>
-    <action command="delete" search="file" path="$$profile$$\wrapper.log"/>
-    <action command="delete" search="file" path="$$profile$$\addressbook\log.txt"/>
+    <action command="delete" search="walk.files" path="$$Profile$$\logs\"/>
+    <action command="delete" search="file" path="$$Profile$$\eventlog.txt"/>
+    <action command="delete" search="file" path="$$Profile$$\wrapper.log"/>
+    <action command="delete" search="file" path="$$ProgramFiles$$\wrapper.log"/>
+    <action command="delete" search="file" path="$$Profile$$\addressbook\log.txt"/>
   </option>
   <option id="temp">
     <label>Temporary files</label>
     <description>Delete the temporary files</description>
-    <action command="delete" search="glob" path="$$temp-folder$$\i2p-*"/>
+    <action command="delete" search="glob" path="$$Temp-Folder$$\i2p-*"/>
   </option>
 </cleaner>