diff --git a/fetchy b/fetchy
new file mode 100755
index 0000000..44ad362
Binary files /dev/null and b/fetchy differ
diff --git a/fetchy.c b/fetchy.c
index 080ad22..fea281a 100644
--- a/fetchy.c
+++ b/fetchy.c
@@ -9,14 +9,14 @@ void main(){
 
 
 	printf("\n");
-	printf("\x1b[1m         .          \x1b[36mOS\x1b[0m:        Arch Linux\n");
-	printf("\x1b[1m        / \\         \x1b[36mKERNEL\x1b[0m:    %s\n", kernel);
-	printf("\x1b[1m       /   \\        \x1b[36mUPTIME\x1b[0m:    %dh, %dm\n", hrs, min);
-	printf("\x1b[1m      /^.   \\       \x1b[36mPACKAGES\x1b[0m:  %d\n", pkgs);
-	printf("\x1b[1m     /  .-.  \\      \x1b[36mSHELL\x1b[0m:     %s\n", shell);
-	printf("\x1b[1m    /  (   ) _\\     \x1b[36mCPU\x1b[0m:       %s\n", cpu);
-	printf("\x1b[1m   / _.~   ~._^\\    \x1b[36mGPU\x1b[0m:       %s\n", gpu);
-	printf("\x1b[1m  /.^         ^.\\   \x1b[36mWM\x1b[0m:        %s\n", wm);
+	printf("\x1b[1m         .          \x1b\n");
+	printf("\x1b[1m        / \\         \x1b[35mos\x1b[0m      Arch Linux\n");
+	printf("\x1b[1m       /   \\        \x1b[35mkern\x1b[0m    %s\n", kernel);
+	printf("\x1b[1m      /^.   \\       \x1b[35mpkgs\x1b[0m    %d\n", pkgs);
+	printf("\x1b[1m     /  .-.  \\      \x1b[35mshell\x1b[0m   %s\n", shell);
+	printf("\x1b[1m    /  (   ) _\\     \x1b[35mwm\x1b[0m      %s\n", wm);
+	printf("\x1b[1m   / _.~   ~._^\\    \x1b\n");
+	printf("\x1b[1m  /.^         ^.\\   \x1b\n");
 	printf("\n\n");
 
 }
diff --git a/info.h b/info.h
index dc8cde8..8f3cd29 100644
--- a/info.h
+++ b/info.h
@@ -1,19 +1,19 @@
 int hrs, min,
     sec, pkgs;
 
-char kernel[50], shell[25],
+char kernel[25], shell[5],
      cpu[70], gpu[70], wm[15];
 
 
 void getWM(){
-	FILE *windowManager = popen("awk 'END{ print $2 }' $HOME/.xinitrc", "r");
+	FILE *windowManager = popen("pgrep -x --list-name \"specterwm|i3|bspwm|awesome|herbsluftwm|mutter|kwin|qtile|fluxbox|openbox|xmonad|dwm\" | cut -c 5-15", "r");
 
 	fscanf(windowManager, "%[^\n]%s", &wm);
 	fclose(windowManager);
 }
 
 
-void getCPU(){
+/*void getCPU(){
 	FILE *cpuName = popen("grep -m 1 name /proc/cpuinfo | awk -F':' '{print $2}' | cut -c 2- ", "r");
 
 	fscanf(cpuName, "%[^\n]%s", &cpu);
@@ -26,7 +26,7 @@ void getGPU(){
 
 	fscanf(gpuName, "%[^\n]%s", &gpu);
 	fclose(gpuName);
-}
+}*/
 
 
 
@@ -37,7 +37,7 @@ void getKernel(){
 	fclose(pathKernel);
 }
 
-void getUptime(){
+/*void getUptime(){
 	FILE *pathUptime = fopen("/proc/uptime", "r");
 
 	fscanf(pathUptime, "%d", &sec);
@@ -45,7 +45,7 @@ void getUptime(){
 
 	hrs = (sec/60/60%24);
 	min = (sec/60%60);
-}
+}*/
 
 void getPackages(){
 	FILE *pacpackages = popen("pacman -Q | wc -l", "r");
@@ -63,10 +63,10 @@ void getShell(){
 
 void init(){
 	getWM();
-	getGPU();
-	getCPU();
+/*	getGPU();
+	getCPU();*/
 	getKernel();
-	getUptime();
+//	getUptime();
 	getPackages();
 	getShell();
 }