Added themes, maybe something else