Layout updates, theme option update