added new theme, refactored code that sets theme and that adds library services, altered some indentation