From 29f719b0618e571569fd2108ee545245479ed04a Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 19 Dec 2018 11:27:16 +0100
Subject: [PATCH 01/16] XnView Classic for Windows (+MRU)

---
 pending/xnview.xml | 63 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pending/xnview.xml

diff --git a/pending/xnview.xml b/pending/xnview.xml
new file mode 100644
index 0000000..8c586dd
--- /dev/null
+++ b/pending/xnview.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    BleachBit
+    Copyright (C) 2008-2018 Andrew Ziem
+    https://www.bleachbit.org
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-->
+<cleaner id="xnview">
+  <label>XnView Classic for Windows</label>
+  <description>Picture Viewer</description>
+  <option id="mru_files">
+    <label>MRU Files</label>
+    <description>Delete list of MRU Files</description>
+    <action command="ini" search="deep" path="FileName_0="/>
+    <action command="ini" search="deep" path="FileName_1="/>
+    <action command="ini" search="deep" path="FileName_2="/>
+    <action command="ini" search="deep" path="FileName_3="/>
+    <action command="ini" search="deep" path="FileName_4="/>
+    <action command="ini" search="deep" path="FileName_5="/>
+    <action command="ini" search="deep" path="FileName_6="/>
+    <action command="ini" search="deep" path="FileName_7="/>
+    <action command="ini" search="deep" path="FileName_8="/>
+    <action command="ini" search="deep" path="FileName_9="/>
+    <action command="ini" search="deep" path="DirName_0="/>
+    <action command="ini" search="deep" path="DirName_1="/>
+    <action command="ini" search="deep" path="DirName_2="/>
+    <action command="ini" search="deep" path="DirName_3="/>
+    <action command="ini" search="deep" path="DirName_4="/>
+    <action command="ini" search="deep" path="DirName_5="/>
+    <action command="ini" search="deep" path="DirName_6="/>
+    <action command="ini" search="deep" path="DirName_7="/>
+    <action command="ini" search="deep" path="DirName_8="/>
+    <action command="ini" search="deep" path="DirName_9="/>
+  </option>
+  <option id="cache">
+    <label>Cache files</label>
+    <description>Delete the cache files</description>
+        <action command="delete" search="file" path="$APPDATA\XnView\XnView.db"/>
+        <action command="delete" search="glob" path="%LocalAppData%\VirtualStore\Program Files*\XnView\cache\*.db"/>
+        <action command="delete" search="glob" path="%ProgramFiles%\XnView\cache\*.db"/>
+  </option>
+  <option id="category_bak">
+    <label>Category Backup</label>
+    <description>Delete the Category Backups</description>
+        <action command="delete" search="file" path="$APPDATA\XnView\category.bak"/>
+        <action command="delete" search="file" path="%LocalAppData%\VirtualStore\Program Files*\XnView\category.bak"/>
+        <action command="delete" search="file" path="%ProgramFiles%\XnView\category.bak"/>
+  </option>
+</cleaner>

From 1e20c87433f2905a239e93269541371d6f7a5533 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 19 Dec 2018 15:14:00 +0100
Subject: [PATCH 02/16] Add files via upload

---
 pending/xnview.xml | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pending/xnview.xml b/pending/xnview.xml
index 8c586dd..e3d0176 100644
--- a/pending/xnview.xml
+++ b/pending/xnview.xml
@@ -19,32 +19,32 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
-<cleaner id="xnview">
+<cleaner id="xnview.new">
   <label>XnView Classic for Windows</label>
   <description>Picture Viewer</description>
-  <option id="mru_files">
-    <label>MRU Files</label>
-    <description>Delete list of MRU Files</description>
-    <action command="ini" search="deep" path="FileName_0="/>
-    <action command="ini" search="deep" path="FileName_1="/>
-    <action command="ini" search="deep" path="FileName_2="/>
-    <action command="ini" search="deep" path="FileName_3="/>
-    <action command="ini" search="deep" path="FileName_4="/>
-    <action command="ini" search="deep" path="FileName_5="/>
-    <action command="ini" search="deep" path="FileName_6="/>
-    <action command="ini" search="deep" path="FileName_7="/>
-    <action command="ini" search="deep" path="FileName_8="/>
-    <action command="ini" search="deep" path="FileName_9="/>
-    <action command="ini" search="deep" path="DirName_0="/>
-    <action command="ini" search="deep" path="DirName_1="/>
-    <action command="ini" search="deep" path="DirName_2="/>
-    <action command="ini" search="deep" path="DirName_3="/>
-    <action command="ini" search="deep" path="DirName_4="/>
-    <action command="ini" search="deep" path="DirName_5="/>
-    <action command="ini" search="deep" path="DirName_6="/>
-    <action command="ini" search="deep" path="DirName_7="/>
-    <action command="ini" search="deep" path="DirName_8="/>
-    <action command="ini" search="deep" path="DirName_9="/>
+  <option id="mru">
+    <label>MRU Files and Folders</label>
+    <description>Delete list of MRU (Most recently used) Files and Folders</description>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_0"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_1"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_2"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_3"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_4"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_5"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_6"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_7"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_8"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_9"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_0"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_1"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_2"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_3"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_4"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_5"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_6"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_7"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_8"/>
+        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_9"/>
   </option>
   <option id="cache">
     <label>Cache files</label>

From 904bf33aa644c0fbcea2c1b80d5c968b5c8e0652 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 19 Dec 2018 17:29:59 +0100
Subject: [PATCH 03/16] Add files via upload

---
 pending/xnview.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pending/xnview.xml b/pending/xnview.xml
index e3d0176..75d151d 100644
--- a/pending/xnview.xml
+++ b/pending/xnview.xml
@@ -18,6 +18,9 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+	CleanerML written by https://github.com/Tobias-B-Besemer
+	v0.1 done on 2018-12-19
+
 -->
 <cleaner id="xnview.new">
   <label>XnView Classic for Windows</label>

From 1270240b50414b3c8d74da579b0caa4c25887621 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Thu, 20 Dec 2018 05:49:56 +0100
Subject: [PATCH 04/16] Revert "Add files via upload"

This reverts commit 904bf33aa644c0fbcea2c1b80d5c968b5c8e0652.
---
 pending/xnview.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pending/xnview.xml b/pending/xnview.xml
index 75d151d..e3d0176 100644
--- a/pending/xnview.xml
+++ b/pending/xnview.xml
@@ -18,9 +18,6 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-	CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.1 done on 2018-12-19
-
 -->
 <cleaner id="xnview.new">
   <label>XnView Classic for Windows</label>

From 2fafd8de8ef9dc22d909306409a09fd1f27b0eec Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Thu, 20 Dec 2018 05:50:12 +0100
Subject: [PATCH 05/16] Revert "Add files via upload"

This reverts commit 1e20c87433f2905a239e93269541371d6f7a5533.
---
 pending/xnview.xml | 48 +++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pending/xnview.xml b/pending/xnview.xml
index e3d0176..8c586dd 100644
--- a/pending/xnview.xml
+++ b/pending/xnview.xml
@@ -19,32 +19,32 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -->
-<cleaner id="xnview.new">
+<cleaner id="xnview">
   <label>XnView Classic for Windows</label>
   <description>Picture Viewer</description>
-  <option id="mru">
-    <label>MRU Files and Folders</label>
-    <description>Delete list of MRU (Most recently used) Files and Folders</description>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_0"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_1"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_2"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_3"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_4"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_5"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_6"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_7"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_8"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="FileName_9"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_0"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_1"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_2"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_3"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_4"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_5"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_6"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_7"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_8"/>
-        <action command="ini" search="glob" path="$APPDATA\XnView\xnview.ini" name="DirName_9"/>
+  <option id="mru_files">
+    <label>MRU Files</label>
+    <description>Delete list of MRU Files</description>
+    <action command="ini" search="deep" path="FileName_0="/>
+    <action command="ini" search="deep" path="FileName_1="/>
+    <action command="ini" search="deep" path="FileName_2="/>
+    <action command="ini" search="deep" path="FileName_3="/>
+    <action command="ini" search="deep" path="FileName_4="/>
+    <action command="ini" search="deep" path="FileName_5="/>
+    <action command="ini" search="deep" path="FileName_6="/>
+    <action command="ini" search="deep" path="FileName_7="/>
+    <action command="ini" search="deep" path="FileName_8="/>
+    <action command="ini" search="deep" path="FileName_9="/>
+    <action command="ini" search="deep" path="DirName_0="/>
+    <action command="ini" search="deep" path="DirName_1="/>
+    <action command="ini" search="deep" path="DirName_2="/>
+    <action command="ini" search="deep" path="DirName_3="/>
+    <action command="ini" search="deep" path="DirName_4="/>
+    <action command="ini" search="deep" path="DirName_5="/>
+    <action command="ini" search="deep" path="DirName_6="/>
+    <action command="ini" search="deep" path="DirName_7="/>
+    <action command="ini" search="deep" path="DirName_8="/>
+    <action command="ini" search="deep" path="DirName_9="/>
   </option>
   <option id="cache">
     <label>Cache files</label>

From dea5a1d7aaa59bdc8a691550c347602efb8e7ae8 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Thu, 20 Dec 2018 05:50:20 +0100
Subject: [PATCH 06/16] Revert "XnView Classic for Windows (+MRU)"

This reverts commit 29f719b0618e571569fd2108ee545245479ed04a.
---
 pending/xnview.xml | 63 ----------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 pending/xnview.xml

diff --git a/pending/xnview.xml b/pending/xnview.xml
deleted file mode 100644
index 8c586dd..0000000
--- a/pending/xnview.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    BleachBit
-    Copyright (C) 2008-2018 Andrew Ziem
-    https://www.bleachbit.org
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
--->
-<cleaner id="xnview">
-  <label>XnView Classic for Windows</label>
-  <description>Picture Viewer</description>
-  <option id="mru_files">
-    <label>MRU Files</label>
-    <description>Delete list of MRU Files</description>
-    <action command="ini" search="deep" path="FileName_0="/>
-    <action command="ini" search="deep" path="FileName_1="/>
-    <action command="ini" search="deep" path="FileName_2="/>
-    <action command="ini" search="deep" path="FileName_3="/>
-    <action command="ini" search="deep" path="FileName_4="/>
-    <action command="ini" search="deep" path="FileName_5="/>
-    <action command="ini" search="deep" path="FileName_6="/>
-    <action command="ini" search="deep" path="FileName_7="/>
-    <action command="ini" search="deep" path="FileName_8="/>
-    <action command="ini" search="deep" path="FileName_9="/>
-    <action command="ini" search="deep" path="DirName_0="/>
-    <action command="ini" search="deep" path="DirName_1="/>
-    <action command="ini" search="deep" path="DirName_2="/>
-    <action command="ini" search="deep" path="DirName_3="/>
-    <action command="ini" search="deep" path="DirName_4="/>
-    <action command="ini" search="deep" path="DirName_5="/>
-    <action command="ini" search="deep" path="DirName_6="/>
-    <action command="ini" search="deep" path="DirName_7="/>
-    <action command="ini" search="deep" path="DirName_8="/>
-    <action command="ini" search="deep" path="DirName_9="/>
-  </option>
-  <option id="cache">
-    <label>Cache files</label>
-    <description>Delete the cache files</description>
-        <action command="delete" search="file" path="$APPDATA\XnView\XnView.db"/>
-        <action command="delete" search="glob" path="%LocalAppData%\VirtualStore\Program Files*\XnView\cache\*.db"/>
-        <action command="delete" search="glob" path="%ProgramFiles%\XnView\cache\*.db"/>
-  </option>
-  <option id="category_bak">
-    <label>Category Backup</label>
-    <description>Delete the Category Backups</description>
-        <action command="delete" search="file" path="$APPDATA\XnView\category.bak"/>
-        <action command="delete" search="file" path="%LocalAppData%\VirtualStore\Program Files*\XnView\category.bak"/>
-        <action command="delete" search="file" path="%ProgramFiles%\XnView\category.bak"/>
-  </option>
-</cleaner>

From d1722e30c2a3618ca9e5f00cda594b3106858815 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 13 Feb 2019 03:26:42 +0100
Subject: [PATCH 07/16] A more fine graded/careful deletion

---
 pending/system_temp_folders.xml | 54 +++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pending/system_temp_folders.xml

diff --git a/pending/system_temp_folders.xml b/pending/system_temp_folders.xml
new file mode 100644
index 0000000..8f26947
--- /dev/null
+++ b/pending/system_temp_folders.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    BleachBit
+    Copyright (C) 2011 Andrew Ziem
+    http://www.bleachbit.org
+
+    Cleaner for SMPlayer by xr09
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
+	v0.1 done on 2019-02-13
+
+-->
+<cleaner id="system_temp_folders">
+  <label>System Temp Folders</label>
+  <description>A more fine graded/careful deletion of the content of the system temp folders</description>
+  <option id="dot_tmp">
+    <label>*.tmp</label>
+    <description>Remove all files with the extension "tmp"</description>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\*.tmp"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp"/>
+  </option>
+  <option id="temp_files">
+    <label>temp*</label>
+    <description>Remove all files starting with "temp"</description>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\temp*"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\temp*"/>
+  </option>
+  <option id="tmp_files">
+    <label>tmp*</label>
+    <description>Remove all files starting with "tmp"</description>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\tmp*"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\tmp*"/>
+  </option>
+  <option id="all_temp_files">
+    <label>All Temp Files</label>
+    <description>Remove all files of the system temp folders (Be careful!)</description>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\"/>
+  </option>
+</cleaner>

From 95e6da17182b26d3ede2aaae63ce1f735797009b Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Mon, 18 Feb 2019 05:47:50 +0100
Subject: [PATCH 08/16] Minor changes + globs -> walks

---
 pending/system_temp_folders.xml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pending/system_temp_folders.xml b/pending/system_temp_folders.xml
index 8f26947..7498c0e 100644
--- a/pending/system_temp_folders.xml
+++ b/pending/system_temp_folders.xml
@@ -2,10 +2,8 @@
 <!--
 
     BleachBit
-    Copyright (C) 2011 Andrew Ziem
-    http://www.bleachbit.org
-
-    Cleaner for SMPlayer by xr09
+    Copyright (C) 2008-2019 Andrew Ziem
+    https://www.bleachbit.org
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -14,14 +12,14 @@
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.1 done on 2019-02-13
+	v0.2 done on 2019-02-17
 
 -->
 <cleaner id="system_temp_folders">
@@ -30,25 +28,25 @@
   <option id="dot_tmp">
     <label>*.tmp</label>
     <description>Remove all files with the extension "tmp"</description>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\*.tmp"/>
-    <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp"/>
+    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\*.tmp"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp"/>
   </option>
   <option id="temp_files">
     <label>temp*</label>
     <description>Remove all files starting with "temp"</description>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\temp*"/>
-    <action command="delete" search="glob" path="%WinDir%\Temp\temp*"/>
+    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\temp*"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\temp*"/>
   </option>
   <option id="tmp_files">
     <label>tmp*</label>
     <description>Remove all files starting with "tmp"</description>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\tmp*"/>
-    <action command="delete" search="glob" path="%WinDir%\Temp\tmp*"/>
+    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\tmp*"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\tmp*"/>
   </option>
   <option id="all_temp_files">
     <label>All Temp Files</label>
     <description>Remove all files of the system temp folders (Be careful!)</description>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\"/>
-    <action command="delete" search="glob" path="%WinDir%\Temp\"/>
+    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\"/>
   </option>
 </cleaner>

From 63b8d6947ece047672b6ce0eaa163afe7723d903 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Mon, 18 Feb 2019 07:31:59 +0100
Subject: [PATCH 09/16] walk+glob & MSI-Logs

---
 pending/system_temp_folders.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pending/system_temp_folders.xml b/pending/system_temp_folders.xml
index 7498c0e..71ddba1 100644
--- a/pending/system_temp_folders.xml
+++ b/pending/system_temp_folders.xml
@@ -19,7 +19,7 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.2 done on 2019-02-17
+	v0.3 done on 2019-02-18
 
 -->
 <cleaner id="system_temp_folders">
@@ -30,23 +30,37 @@
     <description>Remove all files with the extension "tmp"</description>
     <action command="delete" search="walk.all" path="%LocalAppData%\Temp\*.tmp"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp"/>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\*.tmp"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp"/>
   </option>
   <option id="temp_files">
     <label>temp*</label>
     <description>Remove all files starting with "temp"</description>
     <action command="delete" search="walk.all" path="%LocalAppData%\Temp\temp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\temp*"/>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\temp*"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\temp*"/>
   </option>
   <option id="tmp_files">
     <label>tmp*</label>
     <description>Remove all files starting with "tmp"</description>
     <action command="delete" search="walk.all" path="%LocalAppData%\Temp\tmp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\tmp*"/>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\tmp*"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\tmp*"/>
+  </option>
+  <option id="msi_logs">
+    <label>MSI-Logs</label>
+    <description>Remove all files with "MSI*.log" (Microsoft Installer Logs)</description>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\MSI*.log"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\MSI*.log"/>
   </option>
   <option id="all_temp_files">
     <label>All Temp Files</label>
     <description>Remove all files of the system temp folders (Be careful!)</description>
     <action command="delete" search="walk.all" path="%LocalAppData%\Temp\"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\"/>
+    <action command="delete" search="glob" path="%LocalAppData%\Temp\"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\"/>
   </option>
 </cleaner>

From dd2d4c7f530f68a37f4528ec49c770af355a1d67 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Tue, 26 Feb 2019 15:51:01 +0100
Subject: [PATCH 10/16] os="windows"

---
 pending/system_temp_folders.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pending/system_temp_folders.xml b/pending/system_temp_folders.xml
index 71ddba1..68250e9 100644
--- a/pending/system_temp_folders.xml
+++ b/pending/system_temp_folders.xml
@@ -19,10 +19,10 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.3 done on 2019-02-18
+	v0.3.5 done on 2019-02-26
 
 -->
-<cleaner id="system_temp_folders">
+<cleaner id="system_temp_folders" os="windows">
   <label>System Temp Folders</label>
   <description>A more fine graded/careful deletion of the content of the system temp folders</description>
   <option id="dot_tmp">

From 05ae146c0a6a84b4e588e38820adf1a63eef617a Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 27 Feb 2019 20:20:47 +0100
Subject: [PATCH 11/16] Added "More" extension to cleaner

---
 ...stem_temp_folders.xml => system_temp_folders_-_more.xml} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename pending/{system_temp_folders.xml => system_temp_folders_-_more.xml} (95%)

diff --git a/pending/system_temp_folders.xml b/pending/system_temp_folders_-_more.xml
similarity index 95%
rename from pending/system_temp_folders.xml
rename to pending/system_temp_folders_-_more.xml
index 68250e9..d10f4fd 100644
--- a/pending/system_temp_folders.xml
+++ b/pending/system_temp_folders_-_more.xml
@@ -19,11 +19,11 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.3.5 done on 2019-02-26
+	v0.4.0 done on 2019-02-27
 
 -->
-<cleaner id="system_temp_folders" os="windows">
-  <label>System Temp Folders</label>
+<cleaner id="system_temp_folders_more" os="windows">
+  <label translate="true">System Temp Folders - More</label>
   <description>A more fine graded/careful deletion of the content of the system temp folders</description>
   <option id="dot_tmp">
     <label>*.tmp</label>

From 2344dd5f62ed53b780e36342c01332c34586fb96 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Wed, 6 Mar 2019 23:01:56 +0100
Subject: [PATCH 12/16] Fix naming

---
 ...ystem_temp_folders_-_more.xml => system_temp_folders_more.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pending/{system_temp_folders_-_more.xml => system_temp_folders_more.xml} (100%)

diff --git a/pending/system_temp_folders_-_more.xml b/pending/system_temp_folders_more.xml
similarity index 100%
rename from pending/system_temp_folders_-_more.xml
rename to pending/system_temp_folders_more.xml

From 9f692e86e1e5bca25f8c5356284231e0387fd1a8 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Mon, 11 Mar 2019 17:10:02 +0100
Subject: [PATCH 13/16] Do header

---
 pending/system_temp_folders_more.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pending/system_temp_folders_more.xml b/pending/system_temp_folders_more.xml
index d10f4fd..1eec4b0 100644
--- a/pending/system_temp_folders_more.xml
+++ b/pending/system_temp_folders_more.xml
@@ -18,8 +18,14 @@
     You should have received a copy of the GNU General Public License
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-	Rules in CleanerML written by https://github.com/Tobias-B-Besemer
-	v0.4.0 done on 2019-02-27
+    @url none
+    @cleanerversion v0.4.1
+    @cleanerdate 2019-03-11
+    @cleanerby https://github.com/Tobias-B-Besemer
+    @tested ok v???, Windows 7
+    @testeddate 2019-03-10
+    @testedby https://github.com/Tobias-B-Besemer
+    @note 
 
 -->
 <cleaner id="system_temp_folders_more" os="windows">

From 84c3699c4e9f7715105bfee12b175a28e65c24df Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Sun, 17 Mar 2019 23:11:15 +0100
Subject: [PATCH 14/16] v0.5.0

---
 pending/system_temp_folders_more.xml | 73 ++++++++++++++++++++--------
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/pending/system_temp_folders_more.xml b/pending/system_temp_folders_more.xml
index 1eec4b0..91c2d04 100644
--- a/pending/system_temp_folders_more.xml
+++ b/pending/system_temp_folders_more.xml
@@ -12,61 +12,96 @@
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+    @app Windows
     @url none
-    @cleanerversion v0.4.1
-    @cleanerdate 2019-03-11
+    @os Windows
+    @cleanerversion v0.5.0
+    @cleanerdate 2019-03-17
     @cleanerby https://github.com/Tobias-B-Besemer
     @tested ok v???, Windows 7
     @testeddate 2019-03-10
     @testedby https://github.com/Tobias-B-Besemer
-    @note 
+    @note A more fine graded/careful deletion of the content of the system temp folders.
 
 -->
 <cleaner id="system_temp_folders_more" os="windows">
   <label translate="true">System Temp Folders - More</label>
-  <description>A more fine graded/careful deletion of the content of the system temp folders</description>
+  <description>Operating system</description>
   <option id="dot_tmp">
     <label>*.tmp</label>
     <description>Remove all files with the extension "tmp"</description>
-    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\*.tmp"/>
+    <action command="delete" search="walk.all" path="%TMP%\*.tmp"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp"/>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\*.tmp"/>
+    <action command="delete" search="glob" path="%TMP%\*.tmp"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp"/>
   </option>
   <option id="temp_files">
     <label>temp*</label>
     <description>Remove all files starting with "temp"</description>
-    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\temp*"/>
+    <action command="delete" search="walk.all" path="%TMP%\temp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\temp*"/>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\temp*"/>
+    <action command="delete" search="glob" path="%TMP%\temp*"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\temp*"/>
   </option>
   <option id="tmp_files">
     <label>tmp*</label>
     <description>Remove all files starting with "tmp"</description>
-    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\tmp*"/>
+    <action command="delete" search="walk.all" path="%TMP%\tmp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\tmp*"/>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\tmp*"/>
+    <action command="delete" search="glob" path="%TMP%\tmp*"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\tmp*"/>
   </option>
   <option id="msi_logs">
-    <label>MSI-Logs</label>
+    <label>MSI Logs</label>
     <description>Remove all files with "MSI*.log" (Microsoft Installer Logs)</description>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\MSI*.log"/>
+    <action command="delete" search="glob" path="%TMP%\MSI*.log"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\MSI*.log"/>
   </option>
-  <option id="all_temp_files">
-    <label>All Temp Files</label>
-    <description>Remove all files of the system temp folders (Be careful!)</description>
-    <action command="delete" search="walk.all" path="%LocalAppData%\Temp\"/>
+  <option id="all">
+    <label>All temp files</label>
+    <description>Remove all files of the system temp folders</description>
+    <warning>Use the option only if you know what you do!</warning>
+    <action command="delete" search="walk.all" path="%TMP%\"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\"/>
-    <action command="delete" search="glob" path="%LocalAppData%\Temp\"/>
+    <action command="delete" search="glob" path="%TMP%\"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\"/>
   </option>
+  <option id="dot_part">
+    <label>*.part</label>
+    <description>Remove all files with the extension "part" (e.g. Firefox partial downloads)</description>
+    <action command="delete" search="walk.all" path="%TMP%\*.part"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\*.part"/>
+    <action command="delete" search="glob" path="%TMP%\*.part"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.part"/>
+  </option>
+  <option id="dot_log">
+    <label>*.log</label>
+    <description>Remove all files with the extension "log" (e.g. Installer logs)</description>
+    <action command="delete" search="walk.all" path="%TMP%\*.log"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\*.log"/>
+    <action command="delete" search="glob" path="%TMP%\*.log"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.log"/>
+  </option>
+  <option id="dot_txt">
+    <label>*.txt</label>
+    <description>Remove all files with the extension "txt" (e.g. Installer logs)</description>
+    <action command="delete" search="walk.all" path="%TMP%\*.txt"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\*.txt"/>
+    <action command="delete" search="glob" path="%TMP%\*.txt"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.txt"/>
+  </option>
+  <option id="dot_tmp-tmp">
+    <label>*.tmp-tmp</label>
+    <description>Remove all files with the extension "tmp-tmp"</description>
+    <action command="delete" search="walk.all" path="%TMP%\*.tmp-tmp"/>
+    <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp-tmp"/>
+    <action command="delete" search="glob" path="%TMP%\*.tmp-tmp"/>
+    <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp-tmp"/>
+  </option>
 </cleaner>

From ef5bbd35a1f6beaa2cbc556cd4339a3066558555 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Fri, 22 Mar 2019 08:07:02 +0100
Subject: [PATCH 15/16] v0.5.0 - 2019-03-22

---
 pending/system_temp_folders_more.xml | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pending/system_temp_folders_more.xml b/pending/system_temp_folders_more.xml
index 91c2d04..41ebdba 100644
--- a/pending/system_temp_folders_more.xml
+++ b/pending/system_temp_folders_more.xml
@@ -22,8 +22,8 @@
     @url none
     @os Windows
     @cleanerversion v0.5.0
-    @cleanerdate 2019-03-17
-    @cleanerby https://github.com/Tobias-B-Besemer
+    @cleanerdate 2019-03-22
+    @cleanerby https://github.com/Tobias-B-Besemer (2019-02-26 - 2019-03-22)
     @tested ok v???, Windows 7
     @testeddate 2019-03-10
     @testedby https://github.com/Tobias-B-Besemer
@@ -36,72 +36,72 @@
   <option id="dot_tmp">
     <label>*.tmp</label>
     <description>Remove all files with the extension "tmp"</description>
-    <action command="delete" search="walk.all" path="%TMP%\*.tmp"/>
+    <action command="delete" search="walk.all" path="%Temp%\*.tmp"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp"/>
-    <action command="delete" search="glob" path="%TMP%\*.tmp"/>
+    <action command="delete" search="glob" path="%Temp%\*.tmp"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp"/>
   </option>
   <option id="temp_files">
     <label>temp*</label>
     <description>Remove all files starting with "temp"</description>
-    <action command="delete" search="walk.all" path="%TMP%\temp*"/>
+    <action command="delete" search="walk.all" path="%Temp%\temp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\temp*"/>
-    <action command="delete" search="glob" path="%TMP%\temp*"/>
+    <action command="delete" search="glob" path="%Temp%\temp*"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\temp*"/>
   </option>
   <option id="tmp_files">
     <label>tmp*</label>
     <description>Remove all files starting with "tmp"</description>
-    <action command="delete" search="walk.all" path="%TMP%\tmp*"/>
+    <action command="delete" search="walk.all" path="%Temp%\tmp*"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\tmp*"/>
-    <action command="delete" search="glob" path="%TMP%\tmp*"/>
+    <action command="delete" search="glob" path="%Temp%\tmp*"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\tmp*"/>
   </option>
   <option id="msi_logs">
     <label>MSI Logs</label>
     <description>Remove all files with "MSI*.log" (Microsoft Installer Logs)</description>
-    <action command="delete" search="glob" path="%TMP%\MSI*.log"/>
+    <action command="delete" search="glob" path="%Temp%\MSI*.log"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\MSI*.log"/>
   </option>
   <option id="all">
-    <label>All temp files</label>
+    <label>All</label>
     <description>Remove all files of the system temp folders</description>
     <warning>Use the option only if you know what you do!</warning>
-    <action command="delete" search="walk.all" path="%TMP%\"/>
+    <action command="delete" search="walk.all" path="%Temp%\"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\"/>
-    <action command="delete" search="glob" path="%TMP%\"/>
+    <action command="delete" search="glob" path="%Temp%\"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\"/>
   </option>
   <option id="dot_part">
     <label>*.part</label>
     <description>Remove all files with the extension "part" (e.g. Firefox partial downloads)</description>
-    <action command="delete" search="walk.all" path="%TMP%\*.part"/>
+    <action command="delete" search="walk.all" path="%Temp%\*.part"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.part"/>
-    <action command="delete" search="glob" path="%TMP%\*.part"/>
+    <action command="delete" search="glob" path="%Temp%\*.part"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.part"/>
   </option>
   <option id="dot_log">
     <label>*.log</label>
     <description>Remove all files with the extension "log" (e.g. Installer logs)</description>
-    <action command="delete" search="walk.all" path="%TMP%\*.log"/>
+    <action command="delete" search="walk.all" path="%Temp%\*.log"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.log"/>
-    <action command="delete" search="glob" path="%TMP%\*.log"/>
+    <action command="delete" search="glob" path="%Temp%\*.log"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.log"/>
   </option>
   <option id="dot_txt">
     <label>*.txt</label>
     <description>Remove all files with the extension "txt" (e.g. Installer logs)</description>
-    <action command="delete" search="walk.all" path="%TMP%\*.txt"/>
+    <action command="delete" search="walk.all" path="%Temp%\*.txt"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.txt"/>
-    <action command="delete" search="glob" path="%TMP%\*.txt"/>
+    <action command="delete" search="glob" path="%Temp%\*.txt"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.txt"/>
   </option>
   <option id="dot_tmp-tmp">
     <label>*.tmp-tmp</label>
     <description>Remove all files with the extension "tmp-tmp"</description>
-    <action command="delete" search="walk.all" path="%TMP%\*.tmp-tmp"/>
+    <action command="delete" search="walk.all" path="%Temp%\*.tmp-tmp"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\*.tmp-tmp"/>
-    <action command="delete" search="glob" path="%TMP%\*.tmp-tmp"/>
+    <action command="delete" search="glob" path="%Temp%\*.tmp-tmp"/>
     <action command="delete" search="glob" path="%WinDir%\Temp\*.tmp-tmp"/>
   </option>
 </cleaner>

From dd0b1e14d8e158ce3a69edd2fea05ba66a92dec7 Mon Sep 17 00:00:00 2001
From: "Tobias B. Besemer" <Tobias.Besemer@Googlemail.com>
Date: Fri, 22 Mar 2019 08:13:43 +0100
Subject: [PATCH 16/16] Removed two unnecessary globs

---
 pending/system_temp_folders_more.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pending/system_temp_folders_more.xml b/pending/system_temp_folders_more.xml
index 41ebdba..8b172ee 100644
--- a/pending/system_temp_folders_more.xml
+++ b/pending/system_temp_folders_more.xml
@@ -69,8 +69,6 @@
     <warning>Use the option only if you know what you do!</warning>
     <action command="delete" search="walk.all" path="%Temp%\"/>
     <action command="delete" search="walk.all" path="%WinDir%\Temp\"/>
-    <action command="delete" search="glob" path="%Temp%\"/>
-    <action command="delete" search="glob" path="%WinDir%\Temp\"/>
   </option>
   <option id="dot_part">
     <label>*.part</label>