Fixed Controller Routing for Non-Controller Themes