Fix for focus scrolling (#214)
Theme fixes