Change default theme in progress
Merge branch 'feature/Defaukttheme' into develop