Implemented theme switch at runtime and alphabetical entity ordering