diff --git a/build/Mnemosyne.guide b/build/Mnemosyne.guide
index 55a57ed..61b2ef7 100644
--- a/build/Mnemosyne.guide
+++ b/build/Mnemosyne.guide
@@ -138,14 +138,14 @@ There are 2 ways to use Mnemosyne:
    Where <path> is the path to the directory you want to scan.
    
 
-   Using the -g CLI Flag:
+   Using the GUI CLI Keyword:
    -------------------------
 
-      @{b}Mnemosyne -g <path>@{ub}
+      @{b}Mnemosyne GUI <path>@{ub}
 
     Where <path> is the path to the directory you want to scan. 
 
-    Adding the -g flag will open the GUI and start the scanning process.
+    Adding the GUI Keyword will open the GUI and start the scanning process.
 
 
 
diff --git a/src/main.c b/src/main.c
index 16634b8..e1cc9b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <proto/exec.h>
+#include <proto/dos.h>
 
 #include "scan.h"
 #include "window.h"
@@ -103,7 +104,12 @@ int main(int argc, char **argv)
 		closeLibraries();
 		return 0;
 	}
-	if (argv[1][0] == '-' && (argv[1][1] == 'g' || argv[1][1] == 'G') && !argv[1][2] && argc >= 3){
+	if (argv[1][0] == '?')
+	{
+		info();
+		return 0;
+	}
+	if ((int)ReadArgs((UBYTE *)"GUI/A", (LONG *)argv, NULL) > 0 && argc >= 3){
 		if (openLibraries())
 		{
 			createWindow(argv[2]);
@@ -111,11 +117,6 @@ int main(int argc, char **argv)
 		closeLibraries();
 		return 0;
 	}
-	if (argv[1][0] == '?')
-	{
-		info();
-		return 0;
-	}
 	// Printf a line
 	printf("\n----------------------------------------\n");
 	printf("Scanning: %s\n\n", argv[1]);
@@ -126,5 +127,5 @@ int main(int argc, char **argv)
 
 void info(void)
 {
-	printf("Mnemosyne: Starts GUI Application\nMnemosyne (PATH): Scans Selected Path\nMnemosyne -g (PATH): Scans Selected Path in GUI\n");
+	printf("Mnemosyne: Starts GUI Application\nMnemosyne (PATH): Scans Selected Path\nMnemosyne GUI (PATH): Scans Selected Path in GUI\n");
 }