Updated wm-settings, cleaned up