diff --git a/7-Zip/4.65/zz_7zip_4.65_test.ahk b/7-Zip/4.65/zz_7zip_4.65_test.ahk
index fa0fb5d..007a4e0 100644
--- a/7-Zip/4.65/zz_7zip_4.65_test.ahk
+++ b/7-Zip/4.65/zz_7zip_4.65_test.ahk
@@ -38,15 +38,18 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.ExtractArchive
-        {
-            #include ExtractArchive.ahk
-        }
-        else if 1 = 3.Benchmark
-        {
-            #include Benchmark.ahk
+            if 1 = 2.ExtractArchive
+            {
+                #include ExtractArchive.ahk
+            }
+            else if 1 = 3.Benchmark
+            {
+                #include Benchmark.ahk
+            }
         }
     }
 }
diff --git a/7-Zip/9.20/zz_7zip_9.20_test.ahk b/7-Zip/9.20/zz_7zip_9.20_test.ahk
index 50d888c..758ab6b 100644
--- a/7-Zip/9.20/zz_7zip_9.20_test.ahk
+++ b/7-Zip/9.20/zz_7zip_9.20_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.AddArchive
+        if 1 != --list
         {
-            #include AddArchive.ahk
+            #include prepare.ahk
+
+            if 1 = 2.AddArchive
+            {
+                #include AddArchive.ahk
+            }
         }
     }
 }
diff --git a/Abiword/2.6.4/zz_abiword_2.6.4_test.ahk b/Abiword/2.6.4/zz_abiword_2.6.4_test.ahk
index 8357964..d82a5f1 100644
--- a/Abiword/2.6.4/zz_abiword_2.6.4_test.ahk
+++ b/Abiword/2.6.4/zz_abiword_2.6.4_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.SaveAsDesktop
+        if 1 != --list
         {
-            #include SaveAsDesktop.ahk
+            #include prepare.ahk
+
+            if 1 = 2.SaveAsDesktop
+            {
+                #include SaveAsDesktop.ahk
+            }
         }
     }
 }
diff --git a/Abiword/2.9.2/zz_abiword_2.9.2_test.ahk b/Abiword/2.9.2/zz_abiword_2.9.2_test.ahk
index 61fcb73..d59e486 100644
--- a/Abiword/2.9.2/zz_abiword_2.9.2_test.ahk
+++ b/Abiword/2.9.2/zz_abiword_2.9.2_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.load_document
+        if 1 != --list
         {
-            #include load_document.ahk
+            #include prepare.ahk
+
+            if 1 = 2.load_document
+            {
+                #include load_document.ahk
+            }
         }
     }
 }
diff --git a/Abyss Web Server X1/2.7/zz_abyss_web_server_x1_2.7_test.ahk b/Abyss Web Server X1/2.7/zz_abyss_web_server_x1_2.7_test.ahk
index 32b8806..f2d8369 100644
--- a/Abyss Web Server X1/2.7/zz_abyss_web_server_x1_2.7_test.ahk	
+++ b/Abyss Web Server X1/2.7/zz_abyss_web_server_x1_2.7_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.download
+        if 1 != --list
         {
-            #include download.ahk
+            #include prepare.ahk
+
+            if 1 = 2.download
+            {
+                #include download.ahk
+            }
         }
     }
 }
diff --git a/Adobe Flash Player/10.3.183.25/zz_flash_player_10.3.183.25_test.ahk b/Adobe Flash Player/10.3.183.25/zz_flash_player_10.3.183.25_test.ahk
index e9406f4..ab9731a 100644
--- a/Adobe Flash Player/10.3.183.25/zz_flash_player_10.3.183.25_test.ahk	
+++ b/Adobe Flash Player/10.3.183.25/zz_flash_player_10.3.183.25_test.ahk	
@@ -38,15 +38,18 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.SA_LoadLocalFlash
-        {
-            #include SA_LoadLocalFlash.ahk ; StandAlone Flash Player: play locally located SWF
-        }
-        else if 1 = 3.SA_LoadOnlineFlash ; StandAlone Flash Player: play online located SWF
-        {
-            #include SA_LoadOnlineFlash.ahk
+            if 1 = 2.SA_LoadLocalFlash
+            {
+                #include SA_LoadLocalFlash.ahk ; StandAlone Flash Player: play locally located SWF
+            }
+            else if 1 = 3.SA_LoadOnlineFlash ; StandAlone Flash Player: play online located SWF
+            {
+                #include SA_LoadOnlineFlash.ahk
+            }
         }
     }
 }
diff --git a/Adobe Reader/7.1.0/zz_adobe_reader_7.1.0_test.ahk b/Adobe Reader/7.1.0/zz_adobe_reader_7.1.0_test.ahk
index eb289a1..5839ddb 100644
--- a/Adobe Reader/7.1.0/zz_adobe_reader_7.1.0_test.ahk	
+++ b/Adobe Reader/7.1.0/zz_adobe_reader_7.1.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.SearchCurrentDoc
+        if 1 != --list
         {
-            #include SearchCurrentDoc.ahk
+            #include prepare.ahk
+
+            if 1 = 2.SearchCurrentDoc
+            {
+                #include SearchCurrentDoc.ahk
+            }
         }
     }
 }
diff --git a/Aida32/3.94.2/zz_aida32_3.94.2_test.ahk b/Aida32/3.94.2/zz_aida32_3.94.2_test.ahk
index 8be8b10..9fcd620 100644
--- a/Aida32/3.94.2/zz_aida32_3.94.2_test.ahk
+++ b/Aida32/3.94.2/zz_aida32_3.94.2_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.ViewLicense
+        if 1 != --list
         {
-            #include ViewLicense.ahk
+            #include prepare.ahk
+
+            if 1 = 2.ViewLicense
+            {
+                #include ViewLicense.ahk
+            }
         }
     }
 }
diff --git a/Audio Grabber/1.83 SE/zz_audio_grabber_1.83_se_test.ahk b/Audio Grabber/1.83 SE/zz_audio_grabber_1.83_se_test.ahk
index 1ca3d16..2542521 100644
--- a/Audio Grabber/1.83 SE/zz_audio_grabber_1.83_se_test.ahk	
+++ b/Audio Grabber/1.83 SE/zz_audio_grabber_1.83_se_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.calculate_checksum
+        if 1 != --list
         {
-            #include calculate_checksum.ahk
+            #include prepare.ahk
+
+            if 1 = 2.calculate_checksum
+            {
+                #include calculate_checksum.ahk
+            }
         }
     }
 }
diff --git a/DOSBox/0.72/zz_dosbox_0.72_test.ahk b/DOSBox/0.72/zz_dosbox_0.72_test.ahk
index 9a07569..09f6c2a 100644
--- a/DOSBox/0.72/zz_dosbox_0.72_test.ahk
+++ b/DOSBox/0.72/zz_dosbox_0.72_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.intro
+        if 1 != --list
         {
-            #include intro.ahk
+            #include prepare.ahk
+
+            if 1 = 2.intro
+            {
+                #include intro.ahk
+            }
         }
     }
 }
diff --git a/DOSBox/0.74/zz_dosbox_0.74_test.ahk b/DOSBox/0.74/zz_dosbox_0.74_test.ahk
index 603a6e5..559f4d9 100644
--- a/DOSBox/0.74/zz_dosbox_0.74_test.ahk
+++ b/DOSBox/0.74/zz_dosbox_0.74_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.intro
+        if 1 != --list
         {
-            #include intro.ahk
+            #include prepare.ahk
+
+            if 1 = 2.intro
+            {
+                #include intro.ahk
+            }
         }
     }
 }
diff --git a/Double Commander/0.5.4/zz_double_commander_0.5.4_test.ahk b/Double Commander/0.5.4/zz_double_commander_0.5.4_test.ahk
index d45a91e..08f4a29 100644
--- a/Double Commander/0.5.4/zz_double_commander_0.5.4_test.ahk	
+++ b/Double Commander/0.5.4/zz_double_commander_0.5.4_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.multi_rename
+        if 1 != --list
         {
-            #include multi_rename.ahk
+            #include prepare.ahk
+
+            if 1 = 2.multi_rename
+            {
+                #include multi_rename.ahk
+            }
         }
     }
 }
diff --git a/FAR Manager/1.70.2087/zz_far_manager_1.70.2087_test.ahk b/FAR Manager/1.70.2087/zz_far_manager_1.70.2087_test.ahk
index 217aaa5..67dcbf8 100644
--- a/FAR Manager/1.70.2087/zz_far_manager_1.70.2087_test.ahk	
+++ b/FAR Manager/1.70.2087/zz_far_manager_1.70.2087_test.ahk	
@@ -36,11 +36,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.open_folder
+        if 1 != --list
         {
-            #include open_folder.ahk
+            #include prepare.ahk
+
+            if 1 = 2.open_folder
+            {
+                #include open_folder.ahk
+            }
         }
     }
 }
diff --git a/Filzip/3.0.6/zz_filzip_3.0.6_test.ahk b/Filzip/3.0.6/zz_filzip_3.0.6_test.ahk
index c52015a..e3938c3 100644
--- a/Filzip/3.0.6/zz_filzip_3.0.6_test.ahk
+++ b/Filzip/3.0.6/zz_filzip_3.0.6_test.ahk
@@ -36,11 +36,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.ExtractArchive
+        if 1 != --list
         {
-            #include ExtractArchive.ahk
+            #include prepare.ahk
+
+            if 1 = 2.ExtractArchive
+            {
+                #include ExtractArchive.ahk
+            }
         }
     }
 }
diff --git a/Firefox/12.0/zz_firefox_12.0_test.ahk b/Firefox/12.0/zz_firefox_12.0_test.ahk
index 218ced4..ffb8e60 100644
--- a/Firefox/12.0/zz_firefox_12.0_test.ahk
+++ b/Firefox/12.0/zz_firefox_12.0_test.ahk
@@ -38,19 +38,22 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.address_bar
-        {
-            #include address_bar.ahk
-        }
-        else if 1 = 3.download
-        {
-            #include download.ahk
-        }
-        else if 1 = 4.search_bar
-        {
-            #include search_bar.ahk
+            if 1 = 2.address_bar
+            {
+                #include address_bar.ahk
+            }
+            else if 1 = 3.download
+            {
+                #include download.ahk
+            }
+            else if 1 = 4.search_bar
+            {
+                #include search_bar.ahk
+            }
         }
     }
 }
diff --git a/Firefox/2.0.0.20/zz_firefox_2.0.0.20_test.ahk b/Firefox/2.0.0.20/zz_firefox_2.0.0.20_test.ahk
index 481929d..b870c5a 100644
--- a/Firefox/2.0.0.20/zz_firefox_2.0.0.20_test.ahk
+++ b/Firefox/2.0.0.20/zz_firefox_2.0.0.20_test.ahk
@@ -38,19 +38,22 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.address_bar
-        {
-            #include address_bar.ahk
-        }
-        else if 1 = 3.download
-        {
-            #include download.ahk
-        }
-        else if 1 = 4.search_bar
-        {
-            #include search_bar.ahk
+            if 1 = 2.address_bar
+            {
+                #include address_bar.ahk
+            }
+            else if 1 = 3.download
+            {
+                #include download.ahk
+            }
+            else if 1 = 4.search_bar
+            {
+                #include search_bar.ahk
+            }
         }
     }
 }
diff --git a/Firefox/3.0.11/zz_firefox_3.0.11_test.ahk b/Firefox/3.0.11/zz_firefox_3.0.11_test.ahk
index 3663a4f..26a372f 100644
--- a/Firefox/3.0.11/zz_firefox_3.0.11_test.ahk
+++ b/Firefox/3.0.11/zz_firefox_3.0.11_test.ahk
@@ -38,19 +38,22 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.address_bar
-        {
-            #include address_bar.ahk
-        }
-        else if 1 = 3.download
-        {
-            #include download.ahk
-        }
-        else if 1 = 4.search_bar
-        {
-            #include search_bar.ahk
+            if 1 = 2.address_bar
+            {
+                #include address_bar.ahk
+            }
+            else if 1 = 3.download
+            {
+                #include download.ahk
+            }
+            else if 1 = 4.search_bar
+            {
+                #include search_bar.ahk
+            }
         }
     }
 }
diff --git a/Fox Audio Player/0.9.1/zz_fox_audio_player_0.9.1_test.ahk b/Fox Audio Player/0.9.1/zz_fox_audio_player_0.9.1_test.ahk
index b27eb4c..a11e353 100644
--- a/Fox Audio Player/0.9.1/zz_fox_audio_player_0.9.1_test.ahk	
+++ b/Fox Audio Player/0.9.1/zz_fox_audio_player_0.9.1_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.play_wav
+        if 1 != --list
         {
-            #include play_wav.ahk
+            #include prepare.ahk
+
+            if 1 = 2.play_wav
+            {
+                #include play_wav.ahk
+            }
         }
     }
 }
diff --git a/Foxit Reader/2.1.2023/zz_foxit_reader_2.1.2023_test.ahk b/Foxit Reader/2.1.2023/zz_foxit_reader_2.1.2023_test.ahk
index 1d0ede7..09daf4d 100644
--- a/Foxit Reader/2.1.2023/zz_foxit_reader_2.1.2023_test.ahk	
+++ b/Foxit Reader/2.1.2023/zz_foxit_reader_2.1.2023_test.ahk	
@@ -36,11 +36,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.GoToPage
+        if 1 != --list
         {
-            #include GoToPage.ahk
+            #include prepare.ahk
+
+            if 1 = 2.GoToPage
+            {
+                #include GoToPage.ahk
+            }
         }
     }
 }
diff --git a/FreeBASIC/0.24.0/zz_freebasic_0.24.0_test.ahk b/FreeBASIC/0.24.0/zz_freebasic_0.24.0_test.ahk
index 73aa97e..16c9d53 100644
--- a/FreeBASIC/0.24.0/zz_freebasic_0.24.0_test.ahk
+++ b/FreeBASIC/0.24.0/zz_freebasic_0.24.0_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.compile_code
+        if 1 != --list
         {
-            #include compile_code.ahk
+            #include prepare.ahk
+
+            if 1 = 2.compile_code
+            {
+                #include compile_code.ahk
+            }
         }
     }
 }
diff --git a/IrfanView/4.23/zz_irfanview_4.23_test.ahk b/IrfanView/4.23/zz_irfanview_4.23_test.ahk
index 72d3b1b..53b6dd9 100644
--- a/IrfanView/4.23/zz_irfanview_4.23_test.ahk
+++ b/IrfanView/4.23/zz_irfanview_4.23_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.OpenDocument
+        if 1 != --list
         {
-            #include OpenDocument.ahk
+            #include prepare.ahk
+
+            if 1 = 2.OpenDocument
+            {
+                #include OpenDocument.ahk
+            }
         }
     }
 }
diff --git a/Java/6.25/zz_java_6.25_test.ahk b/Java/6.25/zz_java_6.25_test.ahk
index b41b52e..59fc75b 100644
--- a/Java/6.25/zz_java_6.25_test.ahk
+++ b/Java/6.25/zz_java_6.25_test.ahk
@@ -36,11 +36,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.run_java_gui_app
+        if 1 != --list
         {
-            #include run_java_gui_app.ahk
+            #include prepare.ahk
+
+            if 1 = 2.run_java_gui_app
+            {
+                #include run_java_gui_app.ahk
+            }
         }
     }
 }
diff --git a/K-Meleon/1.5.2/zz_k-meleon_1.5.2_test.ahk b/K-Meleon/1.5.2/zz_k-meleon_1.5.2_test.ahk
index 66852dd..10051a5 100644
--- a/K-Meleon/1.5.2/zz_k-meleon_1.5.2_test.ahk
+++ b/K-Meleon/1.5.2/zz_k-meleon_1.5.2_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.OpenDocument
+        if 1 != --list
         {
-            #include OpenDocument.ahk
+            #include prepare.ahk
+
+            if 1 = 2.OpenDocument
+            {
+                #include OpenDocument.ahk
+            }
         }
     }
 }
diff --git a/LBreakout2/2.4.1/zz_lbreakout2_2.4.1_test.ahk b/LBreakout2/2.4.1/zz_lbreakout2_2.4.1_test.ahk
index 180a57e..2a659da 100644
--- a/LBreakout2/2.4.1/zz_lbreakout2_2.4.1_test.ahk
+++ b/LBreakout2/2.4.1/zz_lbreakout2_2.4.1_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.local_game
+        if 1 != --list
         {
-            #include local_game.ahk
+            #include prepare.ahk
+
+            if 1 = 2.local_game
+            {
+                #include local_game.ahk
+            }
         }
     }
 }
diff --git a/LibreOffice/3.6.2/zz_libreOffice_3.6.2_test.ahk b/LibreOffice/3.6.2/zz_libreOffice_3.6.2_test.ahk
index 6891a5a..5effed8 100644
--- a/LibreOffice/3.6.2/zz_libreOffice_3.6.2_test.ahk
+++ b/LibreOffice/3.6.2/zz_libreOffice_3.6.2_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.writer_replace
+        if 1 != --list
         {
-            #include writer_replace.ahk
+            #include prepare.ahk
+
+            if 1 = 2.writer_replace
+            {
+                #include writer_replace.ahk
+            }
         }
     }
 }
diff --git a/Media Player Classic - Home Cinema/1.6.3.5626/zz_mpc_1.6.3.5626_test.ahk b/Media Player Classic - Home Cinema/1.6.3.5626/zz_mpc_1.6.3.5626_test.ahk
index c8c43ea..9f4fde9 100644
--- a/Media Player Classic - Home Cinema/1.6.3.5626/zz_mpc_1.6.3.5626_test.ahk	
+++ b/Media Player Classic - Home Cinema/1.6.3.5626/zz_mpc_1.6.3.5626_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.play_video
+        if 1 != --list
         {
-            #include play_video.ahk
+            #include prepare.ahk
+
+            if 1 = 2.play_video
+            {
+                #include play_video.ahk
+            }
         }
     }
 }
diff --git a/Microsoft Visual Basic/Runtime 6.0/zz_vb_6.0_runtime_test.ahk b/Microsoft Visual Basic/Runtime 6.0/zz_vb_6.0_runtime_test.ahk
index b7c1089..33c498f 100644
--- a/Microsoft Visual Basic/Runtime 6.0/zz_vb_6.0_runtime_test.ahk	
+++ b/Microsoft Visual Basic/Runtime 6.0/zz_vb_6.0_runtime_test.ahk	
@@ -31,13 +31,16 @@ params =
 if CheckParam()
 {
     ; Those brackets are required!
-    if 1 = 1.install
+    if 1 != --list
     {
-        #include install_test.ahk
-    }
-    else if 1 = 2.run_vb6_app
-    {
-        #include run_vb6_app.ahk
+        if 1 = 1.install
+        {
+            #include install_test.ahk
+        }
+        else if 1 = 2.run_vb6_app
+        {
+            #include run_vb6_app.ahk
+        }
     }
 }
 
diff --git a/Miranda IM/0.10.0/zz_miranda_0.10.0_test.ahk b/Miranda IM/0.10.0/zz_miranda_0.10.0_test.ahk
index 7012ed8..b743a2b 100644
--- a/Miranda IM/0.10.0/zz_miranda_0.10.0_test.ahk	
+++ b/Miranda IM/0.10.0/zz_miranda_0.10.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.irc_chat_test
+        if 1 != --list
         {
-            #include irc_chat_test.ahk
+            #include prepare.ahk
+
+            if 1 = 2.irc_chat_test
+            {
+                #include irc_chat_test.ahk
+            }
         }
     }
 }
diff --git a/Mono .net Development Framework/2.11.2/zz_mono_net_framework_2.11.2_test.ahk b/Mono .net Development Framework/2.11.2/zz_mono_net_framework_2.11.2_test.ahk
index 10477cc..2dcada2 100644
--- a/Mono .net Development Framework/2.11.2/zz_mono_net_framework_2.11.2_test.ahk	
+++ b/Mono .net Development Framework/2.11.2/zz_mono_net_framework_2.11.2_test.ahk	
@@ -38,15 +38,18 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.run_net_app
-        {
-            #include run_net_app.ahk
-        }
-        else if 1 = 3.compile_winforms
-        {
-            #include compile_winforms.ahk
+            if 1 = 2.run_net_app
+            {
+                #include run_net_app.ahk
+            }
+            else if 1 = 3.compile_winforms
+            {
+                #include compile_winforms.ahk
+            }
         }
     }
 }
diff --git a/NET Framework/2.0.50727/zz_net_framework_2.0.50727_test.ahk b/NET Framework/2.0.50727/zz_net_framework_2.0.50727_test.ahk
index c31aafb..186860c 100644
--- a/NET Framework/2.0.50727/zz_net_framework_2.0.50727_test.ahk	
+++ b/NET Framework/2.0.50727/zz_net_framework_2.0.50727_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.run_net_app
+        if 1 != --list
         {
-            #include run_net_app.ahk
+            #include prepare.ahk
+
+            if 1 = 2.run_net_app
+            {
+                #include run_net_app.ahk
+            }
         }
     }
 }
diff --git a/Notepad Lite/3.3.1.0/zz_notepad_lite_3.3.1.0_test.ahk b/Notepad Lite/3.3.1.0/zz_notepad_lite_3.3.1.0_test.ahk
index 8830fd1..dda6fed 100644
--- a/Notepad Lite/3.3.1.0/zz_notepad_lite_3.3.1.0_test.ahk	
+++ b/Notepad Lite/3.3.1.0/zz_notepad_lite_3.3.1.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.replace
+        if 1 != --list
         {
-            #include replace.ahk
+            #include prepare.ahk
+
+            if 1 = 2.replace
+            {
+                #include replace.ahk
+            }
         }
     }
 }
diff --git a/Notepad++/6.1.2/zz_notepad++_6.1.2_test.ahk b/Notepad++/6.1.2/zz_notepad++_6.1.2_test.ahk
index 1a8a8c5..f9092f4 100644
--- a/Notepad++/6.1.2/zz_notepad++_6.1.2_test.ahk
+++ b/Notepad++/6.1.2/zz_notepad++_6.1.2_test.ahk
@@ -40,23 +40,26 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.SaveAsDesktop
-        {
-            #include SaveAsDesktop.ahk
-        }
-        else if 1 = 3.OpenDocument
-        {
-            #include OpenDocument.ahk
-        }
-        else if 1 = 4.Ctrl-F.FindDialog
-        {
-            #include Ctrl-F.FindDialog.ahk
-        }
-        else if 1 = 5.Send_Input
-        {
-            #include Send_Input.ahk
+            if 1 = 2.SaveAsDesktop
+            {
+                #include SaveAsDesktop.ahk
+            }
+            else if 1 = 3.OpenDocument
+            {
+                #include OpenDocument.ahk
+            }
+            else if 1 = 4.Ctrl-F.FindDialog
+            {
+                #include Ctrl-F.FindDialog.ahk
+            }
+            else if 1 = 5.Send_Input
+            {
+                #include Send_Input.ahk
+            }
         }
     }
 }
diff --git a/Off By One Browser/3.5.d/zz_off_by_one_browser_3.5.d_test.ahk b/Off By One Browser/3.5.d/zz_off_by_one_browser_3.5.d_test.ahk
index aba6682..4d4b1dd 100644
--- a/Off By One Browser/3.5.d/zz_off_by_one_browser_3.5.d_test.ahk	
+++ b/Off By One Browser/3.5.d/zz_off_by_one_browser_3.5.d_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.address_bar
+        if 1 != --list
         {
-            #include address_bar.ahk
+            #include prepare.ahk
+
+            if 1 = 2.address_bar
+            {
+                #include address_bar.ahk
+            }
         }
     }
 }
diff --git a/OllyDbg/1.10/zz_ollydbg_1.10_test.ahk b/OllyDbg/1.10/zz_ollydbg_1.10_test.ahk
index c99a448..c81c385 100644
--- a/OllyDbg/1.10/zz_ollydbg_1.10_test.ahk
+++ b/OllyDbg/1.10/zz_ollydbg_1.10_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.debug_run
+        if 1 != --list
         {
-            #include debug_run.ahk
+            #include prepare.ahk
+
+            if 1 = 2.debug_run
+            {
+                #include debug_run.ahk
+            }
         }
     }
 }
diff --git a/Opera/9.64/zz_opera_9.64_test.ahk b/Opera/9.64/zz_opera_9.64_test.ahk
index 901da84..685a477 100644
--- a/Opera/9.64/zz_opera_9.64_test.ahk
+++ b/Opera/9.64/zz_opera_9.64_test.ahk
@@ -40,23 +40,26 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
+        if 1 != --list
+        {
+            #include prepare.ahk
 
-        if 1 = 2.AddressBar
-        {
-            #include AddressBar.ahk
-        }
-        else if 1 = 3.Download
-        {
-            #include Download.ahk
-        }
-        else if 1 = 4.FlashPlayer
-        {
-            #include FlashPlayer.ahk
-        }
-        else if 1 = 5.CloseDownload
-        {
-            #include CloseDownload.ahk
+            if 1 = 2.AddressBar
+            {
+                #include AddressBar.ahk
+            }
+            else if 1 = 3.Download
+            {
+                #include Download.ahk
+            }
+            else if 1 = 4.FlashPlayer
+            {
+                #include FlashPlayer.ahk
+            }
+            else if 1 = 5.CloseDownload
+            {
+                #include CloseDownload.ahk
+            }
         }
     }
 }
diff --git a/PuTTY/0.62/zz_putty_0.62_test.ahk b/PuTTY/0.62/zz_putty_0.62_test.ahk
index b8df976..49695dc 100644
--- a/PuTTY/0.62/zz_putty_0.62_test.ahk
+++ b/PuTTY/0.62/zz_putty_0.62_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.telnet
+        if 1 != --list
         {
-            #include telnet.ahk
+            #include prepare.ahk
+
+            if 1 = 2.telnet
+            {
+                #include telnet.ahk
+            }
         }
     }
 }
diff --git a/Python/3.2.3/zz_python_3.2.3_test.ahk b/Python/3.2.3/zz_python_3.2.3_test.ahk
index a1e8768..3175ca8 100644
--- a/Python/3.2.3/zz_python_3.2.3_test.ahk
+++ b/Python/3.2.3/zz_python_3.2.3_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.tkinter_gui
+        if 1 != --list
         {
-            #include tkinter_gui.ahk
+            #include prepare.ahk
+
+            if 1 = 2.tkinter_gui
+            {
+                #include tkinter_gui.ahk
+            }
         }
     }
 }
diff --git a/ReactOS/Paint/zz_paint_test.ahk b/ReactOS/Paint/zz_paint_test.ahk
index 5d60d39..f3b9be0 100644
--- a/ReactOS/Paint/zz_paint_test.ahk
+++ b/ReactOS/Paint/zz_paint_test.ahk
@@ -29,12 +29,15 @@ params =
 
 if CheckParam()
 {
-    #include prepare.ahk
-
-    ; Those brackets are required!
-    if 1 = 1.SaveScreenShot
+    if 1 != --list
     {
-        #include SaveScreenShot.ahk
+        #include prepare.ahk
+
+        ; Those brackets are required!
+        if 1 = 1.SaveScreenShot
+        {
+            #include SaveScreenShot.ahk
+        }
     }
 }
 
diff --git a/SMPlayer/0.6.9/zz_smplayer_0.6.9_test.ahk b/SMPlayer/0.6.9/zz_smplayer_0.6.9_test.ahk
index 094855e..90352ea 100644
--- a/SMPlayer/0.6.9/zz_smplayer_0.6.9_test.ahk
+++ b/SMPlayer/0.6.9/zz_smplayer_0.6.9_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.play_file
+        if 1 != --list
         {
-            #include play_file.ahk
+            #include prepare.ahk
+
+            if 1 = 2.play_file
+            {
+                #include play_file.ahk
+            }
         }
     }
 }
diff --git a/SciTE/1.77/zz_scite_1.77_test.ahk b/SciTE/1.77/zz_scite_1.77_test.ahk
index 6a42605..7da2f39 100644
--- a/SciTE/1.77/zz_scite_1.77_test.ahk
+++ b/SciTE/1.77/zz_scite_1.77_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.replace
+        if 1 != --list
         {
-            #include replace.ahk
+            #include prepare.ahk
+
+            if 1 = 2.replace
+            {
+                #include replace.ahk
+            }
         }
     }
 }
diff --git a/SeaMonkey/1.1.17/zz_seamonkey_1.1.17_test.ahk b/SeaMonkey/1.1.17/zz_seamonkey_1.1.17_test.ahk
index 4052af0..8433853 100644
--- a/SeaMonkey/1.1.17/zz_seamonkey_1.1.17_test.ahk
+++ b/SeaMonkey/1.1.17/zz_seamonkey_1.1.17_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.download
+        if 1 != --list
         {
-            #include download.ahk
+            #include prepare.ahk
+
+            if 1 = 2.download
+            {
+                #include download.ahk
+            }
         }
     }
 }
diff --git a/SumatraPDF/2.1.1/zz_sumatrapdf_2.1.1_test.ahk b/SumatraPDF/2.1.1/zz_sumatrapdf_2.1.1_test.ahk
index 5d8cd3a..a30fe0c 100644
--- a/SumatraPDF/2.1.1/zz_sumatrapdf_2.1.1_test.ahk
+++ b/SumatraPDF/2.1.1/zz_sumatrapdf_2.1.1_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
         else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.find_text
+        if 1 != --list
         {
-            #include find_text.ahk
+            #include prepare.ahk
+
+            if 1 = 2.find_text
+            {
+                #include find_text.ahk
+            }
         }
     }
 }
diff --git a/Sunbird/0.9/zz_sunbird_0.9_test.ahk b/Sunbird/0.9/zz_sunbird_0.9_test.ahk
index 51cf8f4..f69fa51 100644
--- a/Sunbird/0.9/zz_sunbird_0.9_test.ahk
+++ b/Sunbird/0.9/zz_sunbird_0.9_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.new_event
+        if 1 != --list
         {
-            #include new_event.ahk
+            #include prepare.ahk
+
+            if 1 = 2.new_event
+            {
+                #include new_event.ahk
+            }
         }
     }
 }
diff --git a/Super Finder XT/1.6.3.2/zz_super_finder_xt_1.6.3.2_test.ahk b/Super Finder XT/1.6.3.2/zz_super_finder_xt_1.6.3.2_test.ahk
index 9e7a40b..4e117e3 100644
--- a/Super Finder XT/1.6.3.2/zz_super_finder_xt_1.6.3.2_test.ahk	
+++ b/Super Finder XT/1.6.3.2/zz_super_finder_xt_1.6.3.2_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.find_file
+        if 1 != --list
         {
-            #include find_file.ahk
+            #include prepare.ahk
+
+            if 1 = 2.find_file
+            {
+                #include find_file.ahk
+            }
         }
     }
 }
diff --git a/Thunderbird/2.0.0.18/zz_thunderbird_2.0.0.18_test.ahk b/Thunderbird/2.0.0.18/zz_thunderbird_2.0.0.18_test.ahk
index 379d0f2..6acc7c5 100644
--- a/Thunderbird/2.0.0.18/zz_thunderbird_2.0.0.18_test.ahk
+++ b/Thunderbird/2.0.0.18/zz_thunderbird_2.0.0.18_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.SendMail
+        if 1 != --list
         {
-            #include SendMail.ahk
+            #include prepare.ahk
+
+            if 1 = 2.SendMail
+            {
+                #include SendMail.ahk
+            }
         }
     }
 }
diff --git a/Tile World/1.3.0/zz_tile_word_1.3.0_test.ahk b/Tile World/1.3.0/zz_tile_word_1.3.0_test.ahk
index a874370..2a16777 100644
--- a/Tile World/1.3.0/zz_tile_word_1.3.0_test.ahk	
+++ b/Tile World/1.3.0/zz_tile_word_1.3.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.move_tanks
+        if 1 != --list
         {
-            #include move_tanks.ahk
+            #include prepare.ahk
+
+            if 1 = 2.move_tanks
+            {
+                #include move_tanks.ahk
+            }
         }
     }
 }
diff --git a/Total Commander/8.0/zz_totalcmd_8.0_test.ahk b/Total Commander/8.0/zz_totalcmd_8.0_test.ahk
index 6078584..6fbac44 100644
--- a/Total Commander/8.0/zz_totalcmd_8.0_test.ahk	
+++ b/Total Commander/8.0/zz_totalcmd_8.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.find_files
+        if 1 != --list
         {
-            #include find_files.ahk
+            #include prepare.ahk
+
+            if 1 = 2.find_files
+            {
+                #include find_files.ahk
+            }
         }
     }
 }
diff --git a/TuxPaint/0.9.21c/zz_tuxpaint_0.9.21c_test.ahk b/TuxPaint/0.9.21c/zz_tuxpaint_0.9.21c_test.ahk
index 185b3af..917d336 100644
--- a/TuxPaint/0.9.21c/zz_tuxpaint_0.9.21c_test.ahk
+++ b/TuxPaint/0.9.21c/zz_tuxpaint_0.9.21c_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.paint
+        if 1 != --list
         {
-            #include paint.ahk
+            #include prepare.ahk
+
+            if 1 = 2.paint
+            {
+                #include paint.ahk
+            }
         }
     }
 }
diff --git a/UltraVNC/1.0.9.6.2/zz_ultravnc_1.0.9.6.2_test.ahk b/UltraVNC/1.0.9.6.2/zz_ultravnc_1.0.9.6.2_test.ahk
index 82a7657..802478c 100644
--- a/UltraVNC/1.0.9.6.2/zz_ultravnc_1.0.9.6.2_test.ahk
+++ b/UltraVNC/1.0.9.6.2/zz_ultravnc_1.0.9.6.2_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.view_vnc
+        if 1 != --list
         {
-            #include view_vnc.ahk
+            #include prepare.ahk
+
+            if 1 = 2.view_vnc
+            {
+                #include view_vnc.ahk
+            }
         }
     }
 }
diff --git a/Universal Viewer/5.7.2.0/zz_universal_viewer_5.7.2.0_test.ahk b/Universal Viewer/5.7.2.0/zz_universal_viewer_5.7.2.0_test.ahk
index 761493a..6be3f9a 100644
--- a/Universal Viewer/5.7.2.0/zz_universal_viewer_5.7.2.0_test.ahk	
+++ b/Universal Viewer/5.7.2.0/zz_universal_viewer_5.7.2.0_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.GoToPage
+        if 1 != --list
         {
-            #include GoToPage.ahk
+            #include prepare.ahk
+
+            if 1 = 2.GoToPage
+            {
+                #include GoToPage.ahk
+            }
         }
     }
 }
diff --git a/VLC Media Player/0.8.6i/zz_vlc_0.8.6i_test.ahk b/VLC Media Player/0.8.6i/zz_vlc_0.8.6i_test.ahk
index bfa888a..7fc0042 100644
--- a/VLC Media Player/0.8.6i/zz_vlc_0.8.6i_test.ahk	
+++ b/VLC Media Player/0.8.6i/zz_vlc_0.8.6i_test.ahk	
@@ -35,13 +35,16 @@ if CheckParam()
     {
         #include install_test.ahk
     }
-    else 
+    else
     {
-        #include prepare.ahk
-
-        if 1 = 2.PlayVideo
+        if 1 != --list
         {
-            #include PlayVideo.ahk
+            #include prepare.ahk
+
+            if 1 = 2.PlayVideo
+            {
+                #include PlayVideo.ahk
+            }
         }
     }
 }
diff --git a/VLC Media Player/2.0.3/zz_vlc_2.03_test.ahk b/VLC Media Player/2.0.3/zz_vlc_2.03_test.ahk
index 6f0a0ab..741cd76 100644
--- a/VLC Media Player/2.0.3/zz_vlc_2.03_test.ahk	
+++ b/VLC Media Player/2.0.3/zz_vlc_2.03_test.ahk	
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.PlayVideo
+        if 1 != --list
         {
-            #include PlayVideo.ahk
+            #include prepare.ahk
+
+            if 1 = 2.PlayVideo
+            {
+                #include PlayVideo.ahk
+            }
         }
     }
 }
diff --git a/WinBoard/4.2.7/zz_winboard_4.2.7_test.ahk b/WinBoard/4.2.7/zz_winboard_4.2.7_test.ahk
index f65f10b..3d03cea 100644
--- a/WinBoard/4.2.7/zz_winboard_4.2.7_test.ahk
+++ b/WinBoard/4.2.7/zz_winboard_4.2.7_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.play_gnuchess
+        if 1 != --list
         {
-            #include play_gnuchess.ahk
+            #include prepare.ahk
+
+            if 1 = 2.play_gnuchess
+            {
+                #include play_gnuchess.ahk
+            }
         }
     }
 }
diff --git a/WinRAR/3.80/zz_winrar_3.80_test.ahk b/WinRAR/3.80/zz_winrar_3.80_test.ahk
index dbdb403..ef9372c 100644
--- a/WinRAR/3.80/zz_winrar_3.80_test.ahk
+++ b/WinRAR/3.80/zz_winrar_3.80_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.ExtractPwdProtected
+        if 1 != --list
         {
-            #include ExtractPwdProtected.ahk
+            #include prepare.ahk
+
+            if 1 = 2.ExtractPwdProtected
+            {
+                #include ExtractPwdProtected.ahk
+            }
         }
     }
 }
diff --git a/Window title space/zz_window_title_space_test.ahk b/Window title space/zz_window_title_space_test.ahk
index b60de48..d52da469 100644
--- a/Window title space/zz_window_title_space_test.ahk	
+++ b/Window title space/zz_window_title_space_test.ahk	
@@ -31,13 +31,16 @@ params =
 if CheckParam()
 {
     ; Those brackets are required!
-    if 1 = 1.space
+    if 1 != --list
     {
-        #include space.ahk
-    }
-    else if 1 = 2.space_lite
-    {
-        #include space_lite.ahk
+        if 1 = 1.space
+        {
+            #include space.ahk
+        }
+        else if 1 = 2.space_lite
+        {
+            #include space_lite.ahk
+        }
     }
 }
 
diff --git a/mIRC/6.35/zz_mirc_6.35_test.ahk b/mIRC/6.35/zz_mirc_6.35_test.ahk
index 7c74290..a998bbd 100644
--- a/mIRC/6.35/zz_mirc_6.35_test.ahk
+++ b/mIRC/6.35/zz_mirc_6.35_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.ChatTest
+        if 1 != --list
         {
-            #include ChatTest.ahk
+            #include prepare.ahk
+
+            if 1 = 2.ChatTest
+            {
+                #include ChatTest.ahk
+            }
         }
     }
 }
diff --git a/mIRC/7.25/zz_mirc_7.25_test.ahk b/mIRC/7.25/zz_mirc_7.25_test.ahk
index 5fb3ba7..d12b205 100644
--- a/mIRC/7.25/zz_mirc_7.25_test.ahk
+++ b/mIRC/7.25/zz_mirc_7.25_test.ahk
@@ -37,11 +37,14 @@ if CheckParam()
     }
     else 
     {
-        #include prepare.ahk
-
-        if 1 = 2.ChatTest
+        if 1 != --list
         {
-            #include ChatTest.ahk
+            #include prepare.ahk
+
+            if 1 = 2.ChatTest
+            {
+                #include ChatTest.ahk
+            }
         }
     }
 }