Cleaning up theme folder a bit