diff --git a/examples/basic/example.c b/examples/basic/example.c
index 614b4e3..9cc89db 100644
--- a/examples/basic/example.c
+++ b/examples/basic/example.c
@@ -17,7 +17,7 @@ void handler_dark(MwWidget handle, void* user_data, void* call_data) {
 	(void)call_data;
 
 	toggle = toggle ? 0 : 1;
-	MwToggleDarkTheme(window, toggle);
+	MwSetDarkTheme(window, toggle);
 }
 
 void resize(MwWidget handle, void* user_data, void* call_data) {
diff --git a/include/Mw/Core.h b/include/Mw/Core.h
index cd7cabd..aba19e1 100644
--- a/include/Mw/Core.h
+++ b/include/Mw/Core.h
@@ -296,7 +296,7 @@ MWDECL void MwHideCursor(MwWidget handle);
  * @param handle Widget
  * @param toggle Toggle
  */
-MWDECL void MwToggleDarkTheme(MwWidget handle, int toggle);
+MWDECL void MwSetDarkTheme(MwWidget handle, int toggle);
 
 /*!
  * @brief Gets the parent widget
diff --git a/milsko.xml b/milsko.xml
index dc980cd..bc73f0e 100644
--- a/milsko.xml
+++ b/milsko.xml
@@ -353,7 +353,7 @@
 						<widget name="handle" />
 					</arguments>
 				</function>
-				<function name="MwToggleDarkTheme">
+				<function name="MwSetDarkTheme">
 					<arguments>
 						<widget name="handle" />
 						<integer name="toggle" />
diff --git a/src/backend/gdi.c b/src/backend/gdi.c
index ae6a7a6..373ef87 100644
--- a/src/backend/gdi.c
+++ b/src/backend/gdi.c
@@ -266,7 +266,7 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
 	r->common.type	      = MwLLBackendGDI;
 
 	r->gdi.get_clipboard = 1;
-	r->gdi.get_darktheme = 1;
+	if(parent == NULL) r->gdi.get_darktheme = 1;
 	r->gdi.force_render  = 0;
 	r->gdi.grabbed	     = 0;
 	r->gdi.hWnd	     = CreateWindow("milsko", "Milsko", parent == NULL ? (WS_OVERLAPPEDWINDOW) : (WS_CHILD | WS_VISIBLE), x == MwDEFAULT ? CW_USEDEFAULT : x, y == MwDEFAULT ? CW_USEDEFAULT : y, width, height, parent == NULL ? NULL : parent->gdi.hWnd, 0, wc.hInstance, NULL);
diff --git a/src/core.c b/src/core.c
index 9d0d18b..55f667d 100644
--- a/src/core.c
+++ b/src/core.c
@@ -131,7 +131,7 @@ static void lldarkthemehandler(MwLL handle, void* data){
 	MwWidget h = (MwWidget)handle->common.user;
 	int* ptr = data;
 
-	if(IsFirstVisible(h)) MwToggleDarkTheme(h, *ptr);
+	if(IsFirstVisible(h)) MwSetDarkTheme(h, *ptr);
 }
 
 MwWidget MwCreateWidget(MwClass widget_class, const char* name, MwWidget parent, int x, int y, unsigned int width, unsigned int height) {
@@ -747,7 +747,7 @@ static void force_render_all(MwWidget handle) {
 	if(handle->lowlevel != NULL) MwForceRender(handle);
 }
 
-void MwToggleDarkTheme(MwWidget handle, int toggle) {
+void MwSetDarkTheme(MwWidget handle, int toggle) {
 	int old = handle->dark_theme;
 	if(old != toggle) {
 		handle->dark_theme = toggle;