Fixed a few issues with theme renaming