Theme DebugActivity, cleanup