improved theme file