improved theme a bit