Added theming system, final touches