UI changes.
Fixed bug with loading correct theme first time the application runs.