Fixed: Issue 132: Border not correctly themed