Updated theme and add Keychain.