Readability improvements and theme name fix