re-layouting based on theme
Merge branch 'master' of https://github.com/gusdewa/gamp.git