Improve base new theme
Add back default theme and add modern theme
Improve all themes
Merge branch 'enhancement/default'