diff --git a/ColoredCircle.png b/ColoredCircle.png
deleted file mode 100644
index 3fceab3..0000000
Binary files a/ColoredCircle.png and /dev/null differ
diff --git a/README.md b/README.md
index 90daefa..ee8815d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # SingOS
-![Screenshot - just booted](SingJustBooted.png)
+![Screenshot - just booted](screenshots/SingJustBooted.png)
 
 SingOS is a single task operating system.  
   
@@ -12,8 +12,8 @@ It will also be posible to switch between 16, 32 and 64-bit mode
 such that anything on very low level can be tested.  
 
 ## Screenshots
-![Screenshot - svim edit](SingSvimEdit.png)
-![Screenshot - colored circle](ColoredCircle.png)
+![Screenshot - svim edit](screenshots/SingSvimEdit.png)
+![Screenshot - colored circle](screenshots/Sing32ColoredCircles.png)
 
 ## Build Instructions
 You can build and run the OS with following command  
@@ -48,4 +48,4 @@ If you want to run SingOS on real hardware we recommend running it from a usb th
 sudo dd if=/<PATH TO SING OS>/SingOS.img of=/dev/<DEVICE NUMBER FOR USB DRIVE> status=progress oflag=sync
 ```
 
-Now, plug the drive in any x86 pc with BIOS support, push the power button, and enjoy! (^:
\ No newline at end of file
+Now, plug the drive in any x86 pc with BIOS support, push the power button, and enjoy! (^:
diff --git a/SingSvimEdit.png b/SingSvimEdit.png
deleted file mode 100644
index 6c8585b..0000000
Binary files a/SingSvimEdit.png and /dev/null differ
diff --git a/SingSvimList.png b/SingSvimList.png
deleted file mode 100644
index f456560..0000000
Binary files a/SingSvimList.png and /dev/null differ
diff --git a/build.sh b/build.sh
index 55d3179..90c5716 100644
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 if [ "$1" != "run" ]; then
-		nasm -fbin bootloader.nasm -o bootloader.bin
-		nasm -fbin vbr.nasm -o vbr.bin
-		nasm -fbin filesystems/lsfs/test_lsfs.nasm -o lsfs.bin
-		nasm -fbin kernel.nasm -o kernel.bin
+		nasm -fbin bootloader.nasm -o bootloader.bin && \
+		nasm -fbin vbr.nasm -o vbr.bin && \
+		nasm -fbin filesystems/lsfs/test_lsfs.nasm -o lsfs.bin && \
+		nasm -fbin kernel.nasm -o kernel.bin && \
 		cat bootloader.bin vbr.bin lsfs.bin kernel.bin > SingOS.img
 fi
 
 if [ "$1" != "make" ]; then
-	qemu-system-x86_64 -drive index=0,format=raw,file=SingOS.img 
+	qemu-system-x86_64.exe -drive index=0,format=raw,file=SingOS.img 
 fi
diff --git a/screenshots/Sing32ColoredCircles.png b/screenshots/Sing32ColoredCircles.png
new file mode 100644
index 0000000..f904ff9
Binary files /dev/null and b/screenshots/Sing32ColoredCircles.png differ
diff --git a/SingJustBooted.png b/screenshots/SingJustBooted.png
similarity index 100%
rename from SingJustBooted.png
rename to screenshots/SingJustBooted.png
diff --git a/screenshots/SingSvimEdit.png b/screenshots/SingSvimEdit.png
new file mode 100644
index 0000000..0a00c8a
Binary files /dev/null and b/screenshots/SingSvimEdit.png differ