theme fix and html suffix fix