fixed settings
minor fix
fixed theme changing bug