diff --git a/.gitignore b/.gitignore
index 0ef4964b..a87df6c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-templates/*
-logs/*
 install/update.log
+templates/*
+lib/userdata.inc.php
+logs/*
 .buildpath
 .project
 .settings/
@@ -8,4 +9,9 @@ install/update.log
 *~
 .well-known
 .idea
-*.iml
\ No newline at end of file
+*.iml
+
+!templates/Froxlor/
+!templates/Sparkle/
+!templates/misc/
+templates/Froxlor/assets/img/logo_custom.png
diff --git a/install/scripts/language-check.php b/install/scripts/language-check.php
index 17c8463a..872609c5 100644
--- a/install/scripts/language-check.php
+++ b/install/scripts/language-check.php
@@ -19,10 +19,7 @@
 $baseLanguage = 'english.lng.php';
 
 // Check if we're in the CLI
-if(@php_sapi_name() != 'cli'
-   && @php_sapi_name() != 'cgi'
-   && @php_sapi_name() != 'cgi-fcgi'
-) {
+if(@php_sapi_name() !== 'cli') {
 	die('This script will only work in the shell.');
 }
 
diff --git a/install/scripts/switch-server-ip.php b/install/scripts/switch-server-ip.php
index 506cca9f..d8f098f9 100644
--- a/install/scripts/switch-server-ip.php
+++ b/install/scripts/switch-server-ip.php
@@ -16,6 +16,11 @@
  *
  */
 
+// Check if we're in the CLI
+if(@php_sapi_name() !== 'cli') {
+	die('This script will only work in the shell.');
+}
+
 // give control to command line handler
 try {
 	CmdLineHandler::processParameters($argc, $argv);
diff --git a/lib/.gitignore b/lib/.gitignore
deleted file mode 100644
index 015be9fe..00000000
--- a/lib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-userdata.inc.php
diff --git a/templates/.gitignore b/templates/.gitignore
deleted file mode 100644
index 33c4d146..00000000
--- a/templates/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-!Froxlor/
-!Sparkle/
-Froxlor/assets/img/logo_custom.png
-!misc/