diff --git a/.gitmodules b/.gitmodules
index bd4ed3f..d892894 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "CMake"]
 	path = CMake
 	url = https://github.com/QuasarApp/CMake.git
-[submodule "DoxyStyle"]
-	path = DoxyStyle
-	url = https://github.com/QuasarApp/DoxyStyle.git
diff --git a/CMake b/CMake
index 814b6ae..b4a8d3e 160000
--- a/CMake
+++ b/CMake
@@ -1 +1 @@
-Subproject commit 814b6aeb4ea5b3d9985aabe88af92b37f5aed5ad
+Subproject commit b4a8d3e99cd3779fd8abf0decd0c21b04f435f92
diff --git a/DoxyStyle b/DoxyStyle
deleted file mode 160000
index b3d27bf..0000000
--- a/DoxyStyle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b3d27bf1bac532d6a2284cbcc9fb5134778c6440
diff --git a/doxygen.conf b/doxygen.conf
index af33126..906cc48 100644
--- a/doxygen.conf
+++ b/doxygen.conf
@@ -703,7 +703,7 @@ FILE_VERSION_FILTER    =
 # DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
 # tag is left empty.
 
-LAYOUT_FILE            = DoxyStyle/DoxygenLayout.xml
+LAYOUT_FILE            = CMake/DoxyStyle/DoxygenLayout.xml
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -1193,7 +1193,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = DoxyStyle/doxygenStyles.css 
+HTML_EXTRA_STYLESHEET  = CMake/DoxyStyle/doxygenStyles.css 
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note