Change theme option to layout (WIP)