Increased Set Max Count to 30 and add Dark Borders

Increased Set Max Count to 30 and add Dark Borders