major visual overhaul, several template bypasses