Merge pull request #33 from Colt/master

Add Styling to Pins and TextPins
fixed merging conflicts