diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
index 42e43ff23..089845d9a 100644
--- a/src/libprojectM/CMakeLists.txt
+++ b/src/libprojectM/CMakeLists.txt
@@ -7,51 +7,40 @@ INCLUDE(CMakeDependentOption)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 # projectM version block
-set(PROJECTM_VERSION 2.1.0)
+set(PROJECTM_VERSION 2.2.0)
 set(PROJECTM_ABI_LEVEL 2)
 #
 
+SET(USE_THREADS_DEF ON)
+SET(USE_FTGL_DEF ON)
+SET(USE_FBO_DEF ON)
+
 if (EMSCRIPTEN)
+    SET(USE_THREADS-DEF OFF)
+    SET(USE_FTGL_DEF ON)
+    SET(USE_FBO_DEF OFF)
+
     SET(USE_GLES1 ON)
-    SET(USE_INCLUDED_GLEW OFF)
-    SET(USE_THREADS OFF)
-    SET(USE_OPENMP OFF)
-    SET(USE_FTGL OFF)
-    SET(USE_FBO OFF)
     SET(BUILD_PROJECTM_STATIC ON)
     SET(DISABLE_NATIVE_PRESETS ON)
-    SET(USE_CG OFF)
+
     SET(APPLE )
     SET(LINUX )
+
     SET(OPENGL_gl_LIBRARY "fake_gl_lib.a")
     SET(GLEW_LIBRARY "gl.symbols")
     ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS)
 endif (EMSCRIPTEN)
 
-if (APPLE)
-    SET(USE_INCLUDED_GLEW OFF)
-	SET(USE_FTGL ON)
-	SET(USE_OPENMP OFF)
-	SET(BUILD_PROJECTM_STATIC ON)
-    SET(USE_FBO ON)
-    SET(USE_CG ON)
-    SET(USE_GLES1 OFF)
-else (APPLE)
-    # other OS defaults
-    SET(USE_FTGL ON)
-    SET(BUILD_PROJECTM_STATIC ON)
-endif(APPLE)
-
-
-OPTION (USE_GLES1 "Use OpenGL ES" ${USE_GLES1})
+OPTION (USE_GLES1 "Use OpenGL ES" OFF)
 CMAKE_DEPENDENT_OPTION (USE_FBO "Use Framebuffer Objects for increased rendering quality.  Disable this if you are experiencing problems on older or poorly supported hardware." ON "${USE_GLES1}" OFF)  # disabled by default for GLES
-OPTION(USE_FTGL "Use FTGL for on-screen fonts (found on your system)" ${USE_FTGL})
-OPTION (USE_THREADS "Use threads for parallelization" ${USE_THREADS})
-OPTION (USE_OPENMP "Use OpenMP and OMPTL for multi-core parallelization" ${USE_OPENMP})
-OPTION (USE_INCLUDED_GLEW "Use projectM's included implemention of GLEW" ${USE_INCLUDED_GLEW})
-OPTION (USE_CG "Use Cg for Pixel Shader support" ${USE_CG})
-OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" ${USE_DEVIL})
-OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." ${BUILD_PROJECTM_STATIC})
+OPTION(USE_FTGL "Use FTGL for on-screen fonts" ${USE_FTGL_DEF})
+OPTION (USE_THREADS "Use threads for parallelization" ${USE_THREADS_DEF})
+OPTION (USE_OPENMP "Use OpenMP and OMPTL for multi-core parallelization" OFF)
+OPTION (USE_INCLUDED_GLEW "Use projectM's included implemention of GLEW" OFF)
+OPTION (USE_CG "Use Cg for Pixel Shader support" OFF)
+OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
+OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." ON)
 OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" ${DISABLE_NATIVE_PRESETS})
 OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets"  ${DISABLE_MILKDROP_PRESETS})
 
diff --git a/src/projectM-sdl/projectM_SDL_main.cpp b/src/projectM-sdl/projectM_SDL_main.cpp
index 545cedfab..a197db1f0 100644
--- a/src/projectM-sdl/projectM_SDL_main.cpp
+++ b/src/projectM-sdl/projectM_SDL_main.cpp
@@ -152,7 +152,7 @@ int main( int argc, char *argv[] ) {
     app.settings.easterEgg = 0; // ???
     app.settings.shuffleEnabled = 1;
     app.settings.softCutRatingsEnabled = 1; // ???
-    app.settings.presetURL = "presets_tryptonaut";
+    app.settings.presetURL = "../../presets/presets_tryptonaut";
     app.settings.menuFontURL = "fonts/Vera.ttf";
     app.settings.titleFontURL = "fonts/Vera.ttf";