Added Shade selector table - partial implementation