diff --git a/premake5.lua b/premake5.lua
index f44cdf9..abb0686 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -17,7 +17,7 @@ newoption {
 }
 
 newoption {
-	trigger     = "glfwdir",
+	trigger     = "glfwdir64",
 	value       = "PATH",
 	description = "Directory of glfw",
 	default     = "../glfw-3.3.2.bin.WIN64",
@@ -94,8 +94,11 @@ workspace "librw"
 	filter { "platforms:win*gl3" }
 		defines { "GLEW_STATIC" }
 		includedirs { path.join(_OPTIONS["glewdir"], "include") }
-		includedirs { path.join(_OPTIONS["glfwdir"], "include") }
 		includedirs { path.join(_OPTIONS["sdl2dir"], "include") }
+	filter { "platforms:win-x86-gl3" }
+		includedirs { path.join(_OPTIONS["glfwdir32"], "include") }
+	filter { "platforms:win-amd64-gl3" }
+		includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
 
 	filter "action:vs*"
 		buildoptions { "/wd4996", "/wd4244" }
@@ -141,7 +144,7 @@ function findlibs()
 		links { "glew32" }
 	filter { "platforms:win-amd64-gl3" }
 		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
-		libdirs { path.join(_OPTIONS["glfwdir"], "lib-vc2015") }
+		libdirs { path.join(_OPTIONS["glfwdir64"], "lib-vc2015") }
 		libdirs { path.join(_OPTIONS["sdl2dir"], "lib/x64") }
 	filter { "platforms:win-x86-gl3" }
 		libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
@@ -192,10 +195,10 @@ function vucode()
 	filter {}
 end
 
-project "clumpview"
+project "playground"
 	kind "WindowedApp"
 	characterset ("MBCS")
-	skeltool("clumpview")
+	skeltool("playground")
 	flags { "WinMain" }
 	removeplatforms { "*null" }
 	removeplatforms { "ps2" } -- for now
diff --git a/tools/playground/Bm437_IBM_BIOS.FON b/tools/playground/Bm437_IBM_BIOS.FON
new file mode 100644
index 0000000..be2443f
Binary files /dev/null and b/tools/playground/Bm437_IBM_BIOS.FON differ
diff --git a/tools/clumpview/Bm437_IBM_BIOS.tga b/tools/playground/Bm437_IBM_BIOS.tga
similarity index 100%
rename from tools/clumpview/Bm437_IBM_BIOS.tga
rename to tools/playground/Bm437_IBM_BIOS.tga
diff --git a/tools/playground/Bm437_IBM_VGA8.FON b/tools/playground/Bm437_IBM_VGA8.FON
new file mode 100644
index 0000000..6ffa09a
Binary files /dev/null and b/tools/playground/Bm437_IBM_VGA8.FON differ
diff --git a/tools/clumpview/Bm437_IBM_VGA8.tga b/tools/playground/Bm437_IBM_VGA8.tga
similarity index 100%
rename from tools/clumpview/Bm437_IBM_VGA8.tga
rename to tools/playground/Bm437_IBM_VGA8.tga
diff --git a/tools/clumpview/camera.cpp b/tools/playground/camera.cpp
similarity index 100%
rename from tools/clumpview/camera.cpp
rename to tools/playground/camera.cpp
diff --git a/tools/clumpview/camera.h b/tools/playground/camera.h
similarity index 100%
rename from tools/clumpview/camera.h
rename to tools/playground/camera.h
diff --git a/tools/clumpview/font.cpp b/tools/playground/font.cpp
similarity index 100%
rename from tools/clumpview/font.cpp
rename to tools/playground/font.cpp
diff --git a/tools/clumpview/foobar.tga b/tools/playground/foobar.tga
similarity index 100%
rename from tools/clumpview/foobar.tga
rename to tools/playground/foobar.tga
diff --git a/tools/clumpview/main.cpp b/tools/playground/main.cpp
similarity index 100%
rename from tools/clumpview/main.cpp
rename to tools/playground/main.cpp
diff --git a/tools/clumpview/maze.tga b/tools/playground/maze.tga
similarity index 100%
rename from tools/clumpview/maze.tga
rename to tools/playground/maze.tga
diff --git a/tools/clumpview/ras_test.cpp b/tools/playground/ras_test.cpp
similarity index 100%
rename from tools/clumpview/ras_test.cpp
rename to tools/playground/ras_test.cpp
diff --git a/tools/clumpview/teapot.dff b/tools/playground/teapot.dff
similarity index 100%
rename from tools/clumpview/teapot.dff
rename to tools/playground/teapot.dff
diff --git a/tools/clumpview/tl_tests.cpp b/tools/playground/tl_tests.cpp
similarity index 100%
rename from tools/clumpview/tl_tests.cpp
rename to tools/playground/tl_tests.cpp