fixed all the broken stuff - real working theme