changed theme, cleaned