Minor mods + new theme