Changed the Theme Engine

Changed the theme engine for more flexibility in the future