Remove useless theme entries in settings
Fix focus bug
Some bug fixes