diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc9d639..60347bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ include(CMakePackageConfigHelpers)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 #option(CROSSLANG_ENABLE_DOXYGEN "Enable doxygen" ON)
-option(CROSSLANG_SHELLONLY "Only build CrossLang Shell Executable" ON)
+
 option(CROSSLANG_ENABLE_STATIC "Enable Tesses CrossLang static libraries" ON)
 option(CROSSLANG_ENABLE_SHARED "Enable Tesses CrossLang shared libraries" ON)
 option(CROSSLANG_ENABLE_BINARIES "Enable Tesses CrossLang binaries" ON)
@@ -264,11 +264,11 @@ if (APPLE)
 else()
     set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
 endif()
-if(NOT CROSSLANG_SHELLONLY)
 add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchivecreate src/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
 if(NOT WIN32)
@@ -278,22 +278,19 @@ target_link_libraries(crossc PUBLIC crosslang_shared)
 target_link_libraries(crossvm PUBLIC crosslang_shared)
 target_link_libraries(crossint PUBLIC crosslang_shared)
 target_link_libraries(crossdump PUBLIC crosslang_shared)
+target_link_libraries(crosslang PUBLIC crosslang_shared)
 target_link_libraries(crossarchiveextract PUBLIC crosslang_shared)
 target_link_libraries(crossarchivecreate PUBLIC crosslang_shared)
 if(NOT WIN32)
 target_link_libraries(crossthumbnailer PUBLIC crosslang_shared)
 endif()
-endif()
-add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
-
-target_link_libraries(crosslang PUBLIC crosslang_shared)
-
 elseif(CROSSLANG_ENABLE_STATIC)
-if(NOT CROSSLANG_SHELLONLY)
+
 add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchivecreate src/crossarchivecreate.cpp ${CROSSLANG_WIN32_EXE_SRC})
 if(NOT WIN32)
@@ -303,22 +300,18 @@ target_link_libraries(crossc PUBLIC crosslang_static)
 target_link_libraries(crossvm PUBLIC crosslang_static)
 target_link_libraries(crossint PUBLIC crosslang_static)
 target_link_libraries(crossdump PUBLIC crosslang_static)
+target_link_libraries(crosslang PUBLIC crosslang_static)
 target_link_libraries(crossarchiveextract PUBLIC crosslang_static)
 target_link_libraries(crossarchivecreate PUBLIC crosslang_static)
 if(NOT WIN32)
 target_link_libraries(crossthumbnailer PUBLIC crosslang_static)
 endif()
-endif()
-add_executable(crosslang src/crosslang.cpp ${CROSSLANG_WIN32_EXE_SRC})
-
-target_link_libraries(crosslang PUBLIC crosslang_static)
-
 else()
-if(NOT CROSSLANG_SHELLONLY)
 add_executable(crossc src/crosslangcompiler.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossvm src/crosslangvm.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossint src/crosslanginterperter.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossdump src/crosslangdump.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
+add_executable(crosslang src/crosslang.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchiveextract src/crossarchiveextract.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 add_executable(crossarchivecreate src/crossarchivecreate.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
 if(NOT WIN32)
@@ -327,14 +320,13 @@ endif()
 CROSSLANG_LINK_DEPS(crossc)
 CROSSLANG_LINK_DEPS(crossvm)
 CROSSLANG_LINK_DEPS(crossint)
-
+CROSSLANG_LINK_DEPS(crosslang)
 CROSSLANG_LINK_DEPS(crossdump)
 CROSSLANG_LINK_DEPS(crossarchiveextract)
 CROSSLANG_LINK_DEPS(crossarchivecreate)
 if(NOT WIN32)
 CROSSLANG_LINK_DEPS(crossthumbnailer)
 endif()
-
 if(CROSSLANG_FETCHCONTENT)
 target_link_libraries(crossc PUBLIC tessesframework)
 target_link_libraries(crossvm PUBLIC tessesframework)
@@ -358,17 +350,6 @@ if(NOT WIN32)
 target_link_libraries(crossthumbnailer PUBLIC TessesFramework::tessesframework)
 endif()
 endif()
-endif()
-add_executable(crosslang src/crosslang.cpp ${CROSSLANG_SOURCE} ${CROSSLANG_WIN32_EXE_SRC})
-CROSSLANG_LINK_DEPS(crosslang)
-if(CROSSLANG_FETCHCONTENT)
-target_link_libraries(crosslang PUBLIC tessesframework)
-
-else()
-target_link_libraries(crosslang PUBLIC TessesFramework::tessesframework)
-
-endif()
-
 endif()
 install(TARGETS crossc DESTINATION bin)
 install(TARGETS crossvm DESTINATION bin)