Update to 3.1.6.1

Skin shortcut changes. Sync with TLBB 3.1.6.