New design implementation
Merge remote-tracking branch 'origin/theme' into theme