themes automated & speedbar regex fix