diff --git a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
index 60053472..d01f2383 100644
--- a/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
+++ b/src/com/cyanogenmod/setupwizard/ui/SetupWizardActivity.java
@@ -32,6 +32,7 @@ import android.os.UserHandle;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewAnimationUtils;
@@ -354,7 +355,11 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
         mFinishingProgressBar.setIndeterminate(true);
         mFinishingProgressBar.startAnimation(fadeIn);
         final ThemeManager tm = ThemeManager.getInstance(this);
-        tm.addClient(this);
+        try {
+            tm.registerThemeChangeListener(this);
+        } catch (Exception e) {
+            Log.w(TAG, "ThemeChangeListener already registered");
+        }
         mSetupData.finishPages();
     }
 
@@ -470,7 +475,7 @@ public class SetupWizardActivity extends Activity implements SetupDataCallbacks,
                     mEnableAccessibilityController.onDestroy();
                 }
                 final ThemeManager tm = ThemeManager.getInstance(SetupWizardActivity.this);
-                tm.removeClient(SetupWizardActivity.this);
+                tm.unregisterThemeChangeListener(SetupWizardActivity.this);
                 SetupStats.sendEvents(SetupWizardActivity.this);
                 SetupWizardUtils.disableGMSSetupWizard(SetupWizardActivity.this);
                 final WallpaperManager wallpaperManager =