Feature: Extended tool functionality to allow button selection styling to work