diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Boot Configuration/Appearence/New Boot Menu.cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Boot Configuration/Appearence/New Boot Menu.cmd
index 24f7ba7f2a..656d9b6ac4 100644
--- a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Boot Configuration/Appearence/New Boot Menu.cmd	
+++ b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Boot Configuration/Appearence/New Boot Menu.cmd	
@@ -13,7 +13,7 @@ echo However, it is slower and more annoying than the legacy Windows 7 boot menu
 echo]
 echo What would you like to do?
 echo [1] Disable the new boot menu (default)
-echo [2] Enable the boot logo
+echo [2] Enable the new boot menu
 echo]
 choice /c 12 /n /m "Type 1 or 2: "
 if !errorlevel! == 1 (
@@ -35,4 +35,4 @@ goto finish
 :finish
 echo Finished, please reboot your device for changes to apply.
 pause
-exit /b
\ No newline at end of file
+exit /b
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Event Log.cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Event Log.cmd
deleted file mode 100644
index 75a455e610..0000000000
--- a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Event Log.cmd	
+++ /dev/null
@@ -1,17 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" "%*"
-	exit /b
-)
-
-echo This may break some features:
-echo - CapFrameX
-echo - Network menu/icon
-echo If you experience random issues, please enable Event Log again.
-call setSvc.cmd EventLog 4
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
\ No newline at end of file
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Task Scheduler.cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Task Scheduler.cmd
deleted file mode 100644
index ce01ac986f..0000000000
--- a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Disable Task Scheduler.cmd	
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" "%*"
-	exit /b
-)
-
-echo Disabling Task Scheduler will break some features:
-echo - MSI Afterburner startup/updates
-echo - UWP typing (e.g. Search bar)
-call setSvc.cmd Schedule 4
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
\ No newline at end of file
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Event Log (default).cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Event Log (default).cmd
deleted file mode 100644
index 9ca06f215a..0000000000
--- a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Event Log (default).cmd	
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" "%*"
-	exit /b
-)
-
-call setSvc.cmd EventLog 2
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
\ No newline at end of file
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Task Scheduler (default).cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Task Scheduler (default).cmd
deleted file mode 100644
index a2326de090..0000000000
--- a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Enable Task Scheduler (default).cmd	
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
-	call RunAsTI.cmd "%~f0" "%*"
-	exit /b
-)
-
-call setSvc.cmd Schedule 2
-
-echo Finished, please reboot your device for changes to apply.
-pause
-exit /b
\ No newline at end of file
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Event Log.cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Event Log.cmd
new file mode 100644
index 0000000000..59c51aff5a
--- /dev/null
+++ b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Event Log.cmd	
@@ -0,0 +1,37 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
+	call RunAsTI.cmd "%~f0" "%*"
+	exit /b
+)
+
+echo Disabling Event log will break some features:
+echo - CapFrameX
+echo - Network menu/icon
+echo If you experience random issues, please enable Event Log again.
+echo]
+echo [1] Disable Event log
+echo [2] Enable Event log (default)
+echo]
+choice /c 12 /n /m "Type 1 or 2: "
+if !errorlevel! == 1 (
+	goto disable
+) else (
+	goto enable
+)
+
+:disable
+echo]
+call setSvc.cmd EventLog 4 > nul 2>&1
+goto finish
+
+:enable
+echo]
+call setSvc.cmd EventLog 2 > nul 2>&1
+goto finish
+
+:finish
+echo Finished, please reboot your device for changes to apply.
+pause
+exit /b
diff --git a/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Task Scheduler.cmd b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Task Scheduler.cmd
new file mode 100644
index 0000000000..1585f936c8
--- /dev/null
+++ b/src/Executables/Atlas/3. Configuration/2. Advanced Configuration/Event Log and Task Scheduler/Task Scheduler.cmd	
@@ -0,0 +1,37 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
+	call RunAsTI.cmd "%~f0" "%*"
+	exit /b
+)
+
+echo Disabling Task Scheduler will break some features:
+echo - MSI Afterburner startup/updates
+echo - UWP typing (e.g. Search bar)
+echo If you experience random issues, please enable Task Scheduler again.
+echo]
+echo [1] Disable Task Scheduler
+echo [2] Enable Task Scheduler (default)
+echo]
+choice /c 12 /n /m "Type 1 or 2: "
+if !errorlevel! == 1 (
+	goto disable
+) else (
+	goto enable
+)
+
+:disable
+echo]
+call setSvc.cmd Schedule 4 > nul 2>&1
+goto finish
+
+:enable
+echo]
+call setSvc.cmd Schedule 2 > nul 2>&1
+goto finish
+
+:finish
+echo Finished, please reboot your device for changes to apply.
+pause
+exit /b