Add default theme and moved theme namespace