Removed Buggy Theme Support
Improved Routing

Converted Route Information into a parsed Table