Follow #4 Done Theming Support for frontend