diff --git a/reactos/dll/cpl/desk/effappdlg.c b/reactos/dll/cpl/desk/effappdlg.c
index ba5d7a74e85..910c5d3b395 100644
--- a/reactos/dll/cpl/desk/effappdlg.c
+++ b/reactos/dll/cpl/desk/effappdlg.c
@@ -28,7 +28,7 @@ UpdateControls(HWND hwndDlg, GLOBALS *g)
     g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE;
     state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0);
     g->ThemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE;
-
+    g->bHasChanged = TRUE;
 }
 
 
@@ -105,12 +105,12 @@ EffAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 			{
 				case IDOK:
 					SaveCurrentValues(hwndDlg, g);
-					EndDialog(hwndDlg, 0);
+					EndDialog(hwndDlg, IDOK);
 					break;
 
 				case IDCANCEL:
 					g->ThemeAdv = g->Theme;
-					EndDialog(hwndDlg, 0);
+					EndDialog(hwndDlg, IDCANCEL);
 					break;
 
 				case IDC_EFFAPPEARANCE_ANIMATION:
diff --git a/reactos/dll/cpl/desk/theme.c b/reactos/dll/cpl/desk/theme.c
index 511d2f826b4..04cebd51b73 100644
--- a/reactos/dll/cpl/desk/theme.c
+++ b/reactos/dll/cpl/desk/theme.c
@@ -124,8 +124,7 @@ VOID LoadCurrentTheme(THEME* theme)
 	theme->Effects.bTooltipFade	   = theme->Effects.bMenuFade;
 
 	/* show content of windows during dragging */
-	//SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
-	SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0);
+	SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0);
 
 	/* "Hide underlined letters for keyboard navigation until I press the Alt key" */
 	SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &theme->Effects.bKeyboardCues, 0);
@@ -307,7 +306,7 @@ VOID ApplyTheme(THEME* theme, INT ThemeId)
 	 */
 	theme->Effects.bTooltipAnimation  = theme->Effects.bMenuAnimation;
 	theme->Effects.bTooltipFade	   = theme->Effects.bMenuFade;
-	SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE);
+	SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, (PVOID)&theme->Effects.bDragFullWindows, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE);
 	UPDATE_USERPREF(KEYBOARDCUES, &theme->Effects.bKeyboardCues);
 	//UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &theme->Effects.bActiveWindowTracking);
 	//UPDATE_USERPREF(MENUANIMATION, &theme->Effects.bMenuAnimation);