diff --git a/.gitmodules b/.gitmodules
index 4212bb2..f12a173 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "eez"]
-	path = eez
+	path = eez-framework
 	url = https://github.com/eez-open/eez-framework
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a5996c..0c73447 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,10 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
 endif()
 
 include_directories(
-    ./
-    ./eez/libs/agg
-    ./eez/platform/simulator
-    ./src/conf
+    ./src
+    ./eez-framework/src
+    ./eez-framework/src/eez/libs/agg
+    ./eez-framework/src/eez/platform/simulator
 )
 
 
@@ -62,15 +62,15 @@ set(header_files)
 ################################################################################
 # EEZ Framework files
 file(GLOB_RECURSE src_eez
-    eez/*.cpp
-    eez/*.c
+    ./eez-framework/src/eez/*.cpp
+    ./eez-framework/src/eez/*.c
 )
 file(GLOB_RECURSE header_eez
-    eez/*.h
+    ./eez-framework/src/eez/*.h
 )
 
 # exclude STM32 platform specific files
-set (EXCLUDE_DIR "eez/platform/stm32")
+set (EXCLUDE_DIR "./eez-framework/src/eez/platform/stm32")
 foreach (TMP_PATH ${src_eez})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -85,7 +85,7 @@ foreach (TMP_PATH ${header_eez})
 endforeach(TMP_PATH)
 
 # exclude libscpi
-set (EXCLUDE_DIR "eez/libs/libscpi")
+set (EXCLUDE_DIR "./eez-framework/src/eez/libs/libscpi")
 foreach (TMP_PATH ${src_eez})
     string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
     if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
diff --git a/eez b/eez
deleted file mode 160000
index 3051f99..0000000
--- a/eez
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3051f99c87634240d3e7af3c58d9f7594b267519
diff --git a/eez-framework b/eez-framework
new file mode 160000
index 0000000..e67a5a5
--- /dev/null
+++ b/eez-framework
@@ -0,0 +1 @@
+Subproject commit e67a5a5008f34d6d19b08131e0807438998dfdc5
diff --git a/src/conf/eez/gui_conf.h b/src/conf/eez/gui_conf.h
deleted file mode 100644
index fd224a6..0000000
--- a/src/conf/eez/gui_conf.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "../../gui/document.h"
diff --git a/src/conf/eez/conf.h b/src/eez-framework-conf.h
similarity index 100%
rename from src/conf/eez/conf.h
rename to src/eez-framework-conf.h
diff --git a/src/eez-framework-gui-conf.h b/src/eez-framework-gui-conf.h
new file mode 100644
index 0000000..f490775
--- /dev/null
+++ b/src/eez-framework-gui-conf.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "gui/document.h"
diff --git a/src/platform/simulator/win32/icon.rc b/src/platform/simulator/win32/icon.rc
index 299e6cf..04c1a2f 100644
Binary files a/src/platform/simulator/win32/icon.rc and b/src/platform/simulator/win32/icon.rc differ