Revert "Twitter Bird, it's so tacky"

This reverts commit 978a37a5d9c6df39a40f55df000e64e6f74d3239.
Fixed some referencing errors.