Feature/newer theme