Fixed table coloring issues
Added genre support