diff --git a/CMakeLists.txt b/CMakeLists.txt
index b27ebd3a8fcc4eb7abd33d617e36fa5a9a1e9425..792fc9fbf1809b3cad2f791aeb0dab42c52b9b5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,6 @@ project(fggl
 ##
 # begin conan support
 ##
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
-list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
-
 if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
   message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
   file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
@@ -23,8 +20,12 @@ if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
                 TLS_VERIFY ON)
 endif()
 
-include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
 include(${CMAKE_BINARY_DIR}/conan.cmake)
+include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
+
+#list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR})
+#list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
+
 #conan_cmake_autodetect(settings)
 conan_cmake_run(CONANFILE conanfile.txt  # or relative build/conanfile.txt
 				BUILD_TYPE ${CONAN_BUILD_TYPE}
@@ -89,8 +90,15 @@ if (DOXYGEN_FOUND)
 endif (DOXYGEN_FOUND)
 
 # depedencies
-find_package( glfw3 CONFIG REQUIRED )
-target_link_libraries(fggl PRIVATE glfw)
+find_package( glfw3 )
+if ( GLFW3_FOUND )
+	target_link_libraries(fggl PRIVATE glfw)
+else()
+	message("GLFW couldn't be found - something strange is going on")
+	find_package( CONAN_PKG::glfw )
+	target_link_libraries(fggl PRIVATE glfw)
+endif()
+
 
 # engine
 #add_subdirectory(vendor/imgui/)
diff --git a/fggl/CMakeLists.txt b/fggl/CMakeLists.txt
index 6f9b1baf81f2b2613905a740d957aa289157b3c8..84a8e6e8161890d358fc00a20fa9a124248c5692 100644
--- a/fggl/CMakeLists.txt
+++ b/fggl/CMakeLists.txt
@@ -2,6 +2,7 @@
 # Config mode dependencies
 find_package(fmt CONFIG)
 find_package(spdlog CONFIG)
+find_package(glfw3 CONFIG)
 
 configure_file(FgglConfig.h.in FgglConfig.h)
 
diff --git a/fggl/gfx/ogl/CMakeLists.txt b/fggl/gfx/ogl/CMakeLists.txt
index 2fcb3d5015dacec9ccde3838901bd33598ccf622..be75a06f0c15c0e9d49337e3e20554572f0307f3 100644
--- a/fggl/gfx/ogl/CMakeLists.txt
+++ b/fggl/gfx/ogl/CMakeLists.txt
@@ -14,9 +14,17 @@ find_package( glm REQUIRED )
 target_link_libraries(${PROJECT_NAME} PUBLIC glm::glm)
 
 # OpenGL Backend
-find_package( OpenGL REQUIRED )
-include_directories( ${OPENGL_INCLUDE_DIR} )
-target_link_libraries(${PROJECT_NAME} PUBLIC OpenGL::OpenGL)
+if ( WIN32 )
+	message("There is a hack to make opengl detection work on windows, someone should look into this...")
+	find_package( opengl REQUIRED )
+	include_directories( ${OPENGL_INCLUDE_DIR} )
+	target_link_libraries(${PROJECT_NAME} PUBLIC opengl::opengl)
+else()
+	find_package( OpenGL REQUIRED )
+	include_directories( ${OPENGL_INCLUDE_DIR} )
+	target_link_libraries(${PROJECT_NAME} PUBLIC OpenGL::OpenGL)
+endif()
+
 
 # GLEW
 find_package( glad )