Fixed hopefully the i.e. grid issue
Added in color swap globals specific to theme