set theme to metro; add some missing code from development to master