Preparing shell

Syncing layout and theme state