Added light/dark theme for Prism and more refactoring