A lot of additions and changes to the core and theme structure