theme improvments