Merge tag 'cleanup_theme' into develop

summarize, cleanup
remove static elements