bug fix i thinks
theme improvements