Table theming

Need to remove the @todo on line 570.