Replace BORDER_WIDTH macro with appropriate cell_padding parameters