fixing this theme some more