Moved theme out of ntwl and into ntwl_theme