TweakMode Integration

Opening a new pull request for tweak-mode integration because somehow I managed to mess with the previous one. Also, this is a much cleaner pull request than the previous one.