Consolidated theme template files, new layout icons for theme options