Improved theme options and column layouts logic