slight rewrite
New Theme!