diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6116821..f42ccf5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,68 +1,150 @@
+name: Release
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 jobs:
-  create_release:
-    outputs:
-      upload_url: '${{ steps.create_release.outputs.upload_url }}'
-    runs-on: 'ubuntu-latest'
+  build_android_app_bundle:
+    name: Build Android App Bundle
+    needs:
+      - create_release
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/create-release@v1
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Decrypt archive
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-        id: 'create_release'
+          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase "$PASSPHRASE" --output "./archive.tar" "./archive.tar.gpg"
+          tar -xf "./archive.tar"
+          rm "./archive.tar"
+      - name: Setup Flutter
+        uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
         with:
-          release_name: '${{ github.ref }}'
-          tag_name: '${{ github.ref }}'
-  build_web:
+          channel: beta
+      - name: Build Android App Bundle
+        run: flutter build appbundle
+      - name: Upload release asset
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
+        with:
+          asset_content_type: application/octet-stream
+          asset_name: google-photos-album-searcher-android.aab
+          asset_path: ./build/app/outputs/bundle/release/app-release.aab
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+  build_android_application_package:
+    name: Build Android Application Package
     needs:
       - create_release
-    runs-on: 'ubuntu-latest'
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - run: |
-          gpg --batch --decrypt --output "files/browser_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/browser_client_secret.json.gpg"
-          gpg --batch --decrypt --output "files/desktop_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/desktop_client_secret.json.gpg"
-          gpg --batch --decrypt --output "web/firebase-config.js" --passphrase "$PASSPHRASE" --yes "web/firebase-config.js.gpg"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Decrypt archive
         env:
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
-      - uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase "$PASSPHRASE" --output "./archive.tar" "./archive.tar.gpg"
+          tar -xf "./archive.tar"
+          rm "./archive.tar"
+      - name: Setup Flutter
+        uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
+        with:
+          channel: beta
+      - name: Build Android Application Package
+        run: flutter build apk --split-per-abi
+      - name: Upload release asset
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
         with:
-          channel: 'dev'
-      - run: flutter build web --no-sound-null-safety --web-renderer html
-      - uses: FirebaseExtended/action-hosting-deploy@v0
+          asset_content_type: application/vnd.android.package-archive
+          asset_name: google-photos-album-searcher-android-arm64.apk
+          asset_path: ./build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+      - name: Upload release asset
         env:
-          FIREBASE_CLI_PREVIEWS: 'hostingchannels'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
         with:
-          channelId: 'live'
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TIDAL_RUN_307407 }}'
-          projectId: 'tidal-run-307407'
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
+          asset_content_type: application/vnd.android.package-archive
+          asset_name: google-photos-album-searcher-android-x64.apk
+          asset_path: ./build/app/outputs/flutter-apk/app-x86_64-release.apk
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+  build_web:
+    name: Build web
+    needs:
+      - create_release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Decrypt archive
+        env:
+          PASSPHRASE: ${{ secrets.PASSPHRASE }}
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase "$PASSPHRASE" --output "./archive.tar" "./archive.tar.gpg"
+          tar -xf "./archive.tar"
+          rm "./archive.tar"
+      - name: Setup Flutter
+        uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
+        with:
+          channel: beta
+      - name: Build web
+        run: flutter build web --web-renderer "html"
+      - name: Deploy hosting
+        uses: FirebaseExtended/action-hosting-deploy@v0
+        with:
+          channelId: live
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_TIDAL_RUN_307407 }}
+          projectId: tidal-run-307407
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
   build_windows:
+    name: Build Windows
     needs:
       - create_release
-    runs-on: 'windows-latest'
+    runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
-      - run: |
-          gpg --batch --decrypt --output "files/browser_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/browser_client_secret.json.gpg"
-          gpg --batch --decrypt --output "files/desktop_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/desktop_client_secret.json.gpg"
-          gpg --batch --decrypt --output "web/firebase-config.js" --passphrase "$PASSPHRASE" --yes "web/firebase-config.js.gpg"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Decrypt archive
         env:
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
-        shell: 'bash'
-      - uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase "$PASSPHRASE" --output "./archive.tar" "./archive.tar.gpg"
+          tar -xf "./archive.tar"
+          rm "./archive.tar"
+        shell: bash
+      - name: Setup Flutter
+        uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
         with:
-          channel: 'dev'
-      - run: flutter config --enable-windows-desktop
-      - run: flutter build windows --no-sound-null-safety
-      - run: Compress-Archive -DestinationPath Release.zip -Path build\windows\runner\Release
-      - uses: actions/upload-release-asset@v1
+          channel: beta
+      - name: Build Windows
+        run: flutter build windows
+      - name: Create installer
+        run: . "${env:ProgramFiles(x86)}\Inno Setup 6\iscc.exe" ".\setup.iss"
+      - name: Upload release asset
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: actions/upload-release-asset@v1
+        with:
+          asset_content_type: application/vnd.microsoft.portable-executable
+          asset_name: google-photos-album-searcher-windows-x64.exe
+          asset_path: ./Output/mysetup.exe
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+  create_release:
+    name: Create release
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create release
         env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        id: create_release
+        uses: actions/create-release@v1
         with:
-          asset_content_type: 'application/zip'
-          asset_name: 'windows.zip'
-          asset_path: 'Release.zip'
-          upload_url: '${{ needs.create_release.outputs.upload_url }}'
+          release_name: ${{ github.ref }}
+          tag_name: ${{ github.ref }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d3d0a77..b0a7db3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,46 +1,31 @@
+name: Test
 on:
   pull_request:
     branches:
       - main
 jobs:
   build_web:
-    runs-on: 'ubuntu-latest'
+    name: Build web
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - run: |
-          gpg --batch --decrypt --output "files/browser_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/browser_client_secret.json.gpg"
-          gpg --batch --decrypt --output "files/desktop_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/desktop_client_secret.json.gpg"
-          gpg --batch --decrypt --output "web/firebase-config.js" --passphrase "$PASSPHRASE" --yes "web/firebase-config.js.gpg"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Decrypt archive
         env:
           PASSPHRASE: ${{ secrets.PASSPHRASE }}
-      - uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
+        run: |
+          gpg --quiet --batch --yes --decrypt --passphrase "$PASSPHRASE" --output "./archive.tar" "./archive.tar.gpg"
+          tar -xf "./archive.tar"
+          rm "./archive.tar"
+      - name: Setup Flutter
+        uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
         with:
-          channel: 'dev'
-      - run: flutter build web --no-sound-null-safety --web-renderer html
-      - uses: FirebaseExtended/action-hosting-deploy@v0
-        env:
-          FIREBASE_CLI_PREVIEWS: 'hostingchannels'
-        with:
-          firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_TIDAL_RUN_307407 }}'
-          projectId: 'tidal-run-307407'
-          repoToken: '${{ secrets.GITHUB_TOKEN }}'
-  build_windows:
-    runs-on: 'windows-latest'
-    steps:
-      - uses: actions/checkout@v2
-      - run: |
-          gpg --batch --decrypt --output "files/browser_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/browser_client_secret.json.gpg"
-          gpg --batch --decrypt --output "files/desktop_client_secret.json" --passphrase "$PASSPHRASE" --yes "files/desktop_client_secret.json.gpg"
-          gpg --batch --decrypt --output "web/firebase-config.js" --passphrase "$PASSPHRASE" --yes "web/firebase-config.js.gpg"
-        env:
-          PASSPHRASE: ${{ secrets.PASSPHRASE }}
-        shell: 'bash'
-      - uses: tnc1997/github-actions/actions/setup-flutter@setup-flutter_v1
-        with:
-          channel: 'dev'
-      - run: flutter config --enable-windows-desktop
-      - run: flutter build windows --no-sound-null-safety
-      - uses: actions/upload-artifact@v2
+          channel: beta
+      - name: Build web
+        run: flutter build web --web-renderer "html"
+      - name: Deploy hosting
+        uses: FirebaseExtended/action-hosting-deploy@v0
         with:
-          name: 'windows'
-          path: 'build\windows\runner\Release'
+          firebaseServiceAccount: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_TIDAL_RUN_307407 }}
+          projectId: tidal-run-307407
+          repoToken: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 3f643c0..560296c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,190 +1,47 @@
-# Created by https://www.toptal.com/developers/gitignore/api/firebase,flutter,intellij,vscode
-# Edit at https://www.toptal.com/developers/gitignore?templates=firebase,flutter,intellij,vscode
-
-### Firebase ###
-**/node_modules/*
-**/.firebaserc
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
 
-### Firebase Patch ###
-.runtimeconfig.json
-.firebase/
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
 
-### Flutter ###
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.fvm/
-.packages
 .pub-cache/
 .pub/
-build/
-coverage/
-lib/generated_plugin_registrant.dart
-# For library packages, don’t commit the pubspec.lock file.
-# Regenerating the pubspec.lock file lets you test your package against the latest compatible versions of its dependencies.
-# See https://dart.dev/guides/libraries/private-files#pubspeclock
-#pubspec.lock
-
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/key.properties
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/.last_build_id
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
-.idea/**/sonarlint/
-
-# SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
+/build/
 
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
+# Symbolication related
+app.*.symbols
 
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
+# Obfuscation related
+app.*.map.json
 
-### vscode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
 
-### Other ###
-files/browser_client_secret.json
-files/desktop_client_secret.json
-web/firebase-config.js
+# Secret related
+/lib/firebase_options.dart
+/lib/google_sign_in_parameters.dart
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index ea96b3c..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/../../../../:\Repos\flutter-google-photos-album-searcher\.idea/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b592662..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/album_searcher_for_google_photos.iml" filepath="$PROJECT_DIR$/album_searcher_for_google_photos.iml" />
-      <module fileurl="file://$PROJECT_DIR$/android/album_searcher_for_google_photos_android.iml" filepath="$PROJECT_DIR$/android/album_searcher_for_google_photos_android.iml" />
-    </modules>
-  </component>
-</project>
diff --git a/.idea/runConfigurations/main_dart.xml b/.idea/runConfigurations/main_dart.xml
deleted file mode 100644
index 5d918c8..0000000
--- a/.idea/runConfigurations/main_dart.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
-    <option name="additionalArgs" value="--no-sound-null-safety" />
-    <option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
-    <method />
-  </configuration>
-</component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.metadata b/.metadata
index c60a809..4262e0d 100644
--- a/.metadata
+++ b/.metadata
@@ -4,7 +4,36 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: cc9b78fc5c4a4d2d51316d9626523336230a89a9
-  channel: dev
+  revision: "29babcb32a591b9e5be8c6a6075d4fe605d46ad3"
+  channel: "beta"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+      base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+    - platform: android
+      create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+      base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+    - platform: linux
+      create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+      base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+    - platform: web
+      create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+      base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+    - platform: windows
+      create_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+      base_revision: 29babcb32a591b9e5be8c6a6075d4fe605d46ad3
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/.versionrc b/.versionrc
deleted file mode 100644
index 5f91f9c..0000000
--- a/.versionrc
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "bumpFiles": [
-    {
-      "filename": "pubspec.yaml",
-      "updater": "./scripts/standard-version-updater.js"
-    }
-  ],
-  "releaseCommitMessageFormat": "chore(release): {{currentTag}}",
-  "types": [
-    {
-      "hidden": false,
-      "section": "Builds",
-      "type": "build"
-    },
-    {
-      "hidden": false,
-      "section": "Chores",
-      "type": "chore"
-    },
-    {
-      "hidden": false,
-      "section": "Continuous Integrations",
-      "type": "ci"
-    },
-    {
-      "hidden": false,
-      "section": "Documentation",
-      "type": "docs"
-    },
-    {
-      "hidden": false,
-      "section": "Features",
-      "type": "feat"
-    },
-    {
-      "hidden": false,
-      "section": "Bug Fixes",
-      "type": "fix"
-    },
-    {
-      "hidden": false,
-      "section": "Performance Improvements",
-      "type": "perf"
-    },
-    {
-      "hidden": false,
-      "section": "Code Refactoring",
-      "type": "refactor"
-    },
-    {
-      "hidden": false,
-      "section": "Reverts",
-      "type": "revert"
-    },
-    {
-      "hidden": false,
-      "section": "Styles",
-      "type": "style"
-    },
-    {
-      "hidden": false,
-      "section": "Tests",
-      "type": "test"
-    }
-  ]
-}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb304b7..b86b092 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,42 +2,36 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-### [1.0.4](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/compare/v1.0.3...v1.0.4) (2021-03-25)
-
+## [1.0.4](https://github.com/tnc1997/google-photos-album-searcher/compare/v1.0.3...v1.0.4) (2021-03-25)
 
 ### Builds
 
-* add firebase analytics ([#6](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/6)) ([4b84857](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/4b84857a594d0851f45bcdc0f71e0c8af74fe817))
-
-### [1.0.3](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/compare/v1.0.2...v1.0.3) (2021-03-24)
+* add firebase analytics ([#6](https://github.com/tnc1997/google-photos-album-searcher/issues/6)) ([4b84857](https://github.com/tnc1997/google-photos-album-searcher/commit/4b84857a594d0851f45bcdc0f71e0c8af74fe817))
 
+## [1.0.3](https://github.com/tnc1997/google-photos-album-searcher/compare/v1.0.2...v1.0.3) (2021-03-24)
 
 ### Bug Fixes
 
-* terms of service url ([#5](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/5)) ([a7dde9f](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/a7dde9f1a4216131782e2bdbeeb558665d565093))
-
+* terms of service url ([#5](https://github.com/tnc1997/google-photos-album-searcher/issues/5)) ([a7dde9f](https://github.com/tnc1997/google-photos-album-searcher/commit/a7dde9f1a4216131782e2bdbeeb558665d565093))
 
 ### Code Refactoring
 
-* authentication services ([#4](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/4)) ([4a14f2e](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/4a14f2e17e40ae039ab59c810aa9c15c15828637))
-
-### [1.0.2](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/compare/v1.0.1...v1.0.2) (2021-03-24)
+* authentication services ([#4](https://github.com/tnc1997/google-photos-album-searcher/issues/4)) ([4a14f2e](https://github.com/tnc1997/google-photos-album-searcher/commit/4a14f2e17e40ae039ab59c810aa9c15c15828637))
 
+## [1.0.2](https://github.com/tnc1997/google-photos-album-searcher/compare/v1.0.1...v1.0.2) (2021-03-24)
 
 ### Code Refactoring
 
-* sign in page to welcome page ([#3](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/3)) ([d9f5349](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/d9f534927125d1286aa9f34f389b67bad0047746)), closes [#2](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/2)
-
-### [1.0.1](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/compare/v1.0.0...v1.0.1) (2021-03-22)
+* sign in page to welcome page ([#3](https://github.com/tnc1997/google-photos-album-searcher/issues/3)) ([d9f5349](https://github.com/tnc1997/google-photos-album-searcher/commit/d9f534927125d1286aa9f34f389b67bad0047746)), closes [#2](https://github.com/tnc1997/google-photos-album-searcher/issues/2)
 
+## [1.0.1](https://github.com/tnc1997/google-photos-album-searcher/compare/v1.0.0...v1.0.1) (2021-03-22)
 
 ### Chores
 
-* add privacy and terms ([#1](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/issues/1)) ([25ae9c4](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/25ae9c4f7b68cdc07a9eb3f30ff3d0ab49880513))
+* add privacy and terms ([#1](https://github.com/tnc1997/google-photos-album-searcher/issues/1)) ([25ae9c4](https://github.com/tnc1997/google-photos-album-searcher/commit/25ae9c4f7b68cdc07a9eb3f30ff3d0ab49880513))
 
 ## 1.0.0 (2021-03-21)
 
-
 ### Chores
 
-* initial commit ([842549c](https://github.com/tnc1997/flutter-album-searcher-for-google-photos/commit/842549c39e779d684ef2781164b226299f66ab23))
+* initial commit ([842549c](https://github.com/tnc1997/google-photos-album-searcher/commit/842549c39e779d684ef2781164b226299f66ab23))
diff --git a/LICENSE b/LICENSE
index 7aeba44..fa1707a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Thomas Clark
+Copyright (c) 2024 Thomas Clark
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 0f95db8..148b7af 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,16 @@
-# Album Searcher for Google Photos
+Album Searcher for Google Photos
 
-Album Searcher for Google Photos gives you an enhanced search experience for shared albums.
+Please note that Album Searcher for Google Photos is unofficial and not endorsed by Google.
 
 ## Getting Started
 
 1. Create a [Google Cloud Platform project](https://console.cloud.google.com/projectcreate).
-1. Enable the [Photos Library API](https://console.cloud.google.com/apis/library/photoslibrary.googleapis.com).
-1. Create an [OAuth consent screen](https://console.cloud.google.com/apis/credentials/consent) with the scopes "[openid](https://developers.google.com/identity/protocols/oauth2/scopes#oauth2)" and "[https://www.googleapis.com/auth/photoslibrary.readonly](https://developers.google.com/identity/protocols/oauth2/scopes#photoslibrary)".
-1. Create an [OAuth client](https://console.cloud.google.com/apis/credentials/oauthclient) for desktop.
-1. Create an [OAuth client](https://console.cloud.google.com/apis/credentials/oauthclient) for web with the authorised JavaScript origin "http://localhost:1234" and the authorised redirect URI "http://localhost:1234/oauth2redirect.html".
-1. Download the JSON of the desktop OAuth client to the directory "files" with the name "desktop_client_secret.json".
-1. Download the JSON of the web OAuth client to the directory "files" with the name "browser_client_secret.json".
-1. Create a [Firebase project](https://console.firebase.google.com) linked to the existing [Google Cloud Platform project](https://console.cloud.google.com).
-1. Add a [web app](https://firebase.google.com/docs/web/setup) to the [Firebase project](https://console.firebase.google.com) making a note of the Firebase config.
-1. Create a file "firebase-config.js" in the directory "web" with the following content:
-    ```javascript
-    export var firebaseConfig = {
-        apiKey: "API_KEY",
-        authDomain: "PROJECT_ID.firebaseapp.com",
-        databaseURL: "https://PROJECT_ID.firebaseio.com",
-        projectId: "PROJECT_ID",
-        storageBucket: "PROJECT_ID.appspot.com",
-        messagingSenderId: "SENDER_ID",
-        appId: "APP_ID",
-        measurementId: "G-MEASUREMENT_ID",
-    };
-    ```
-1. Run `flutter run --device-id windows --no-sound-null-safety` to start the application on desktop.
-1. Run `flutter run --device-id chrome --no-sound-null-safety --web-port 1234 --web-renderer html` to start the application on web.
+2. Enable the [Photos Library API](https://console.cloud.google.com/apis/library/photoslibrary.googleapis.com).
+3. Create an [OAuth consent screen](https://console.cloud.google.com/apis/credentials/consent) with the scopes "[openid](https://developers.google.com/identity/protocols/oauth2/scopes#oauth2)" and "[https://www.googleapis.com/auth/photoslibrary.readonly](https://developers.google.com/identity/protocols/oauth2/scopes#photoslibrary)".
+4. Create an [OAuth client](https://console.cloud.google.com/apis/credentials/oauthclient) for desktop.
+5. Create an [OAuth client](https://console.cloud.google.com/apis/credentials/oauthclient) for web with the authorised JavaScript origins "http://localhost" and "http://localhost:7357".
+6. Create a file "google_sign_in_parameters.dart" with the OAuth client credentials for each platform.
+7. Create a [Firebase project](https://console.firebase.google.com) linked to the existing [Google Cloud Platform project](https://console.cloud.google.com).
+8. Setup Firebase in the Flutter application by following [these](https://firebase.google.com/docs/flutter/setup) instructions.
+9. Run `flutter run --device-id windows` to start the application on desktop.
+10. Run `flutter run --device-id chrome --web-port 7357 --web-renderer html` to start the application on web.
diff --git a/album_searcher_for_google_photos.iml b/album_searcher_for_google_photos.iml
deleted file mode 100644
index 3de44f0..0000000
--- a/album_searcher_for_google_photos.iml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/.idea" />
-      <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/example/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/url_launcher_windows/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/path_provider_windows/build" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/example/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/example/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/windows/flutter/ephemeral/.plugin_symlinks/shared_preferences_windows/example/build" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Flutter Plugins" level="project" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/analysis_options.yaml b/analysis_options.yaml
new file mode 100644
index 0000000..0d29021
--- /dev/null
+++ b/analysis_options.yaml
@@ -0,0 +1,28 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at https://dart.dev/lints.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
diff --git a/android/.gitignore b/android/.gitignore
index 0a741cb..1c580ac 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -5,7 +5,10 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
+/app/google-services.json
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
+**/*.keystore
+**/*.jks
diff --git a/android/album_searcher_for_google_photos_android.iml b/android/album_searcher_for_google_photos_android.iml
deleted file mode 100644
index 1899969..0000000
--- a/android/album_searcher_for_google_photos_android.iml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
-        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/app/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/app/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/app/src/main/assets" />
-        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/app/src/main/libs" />
-        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/app/src/main/proguard_logs" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/app/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/app/src/main/kotlin" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Flutter for Android" level="project" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-  </component>
-</module>
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d8185d1..eeac53c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,58 +1,81 @@
+plugins {
+    id "com.android.application"
+    // START: FlutterFire Configuration
+    id 'com.google.gms.google-services'
+    // END: FlutterFire Configuration
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystorePropertiesFile.withReader("UTF-8") { reader ->
+        keystoreProperties.load(reader)
+    }
+}
+
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 30
+    namespace = "app.thomasclark.googlephotosalbumsearcher"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "app.thomasclark.albumsearcherforgooglephotos"
-        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        applicationId = "app.thomasclark.googlephotosalbumsearcher"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
+    }
+
+    signingConfigs {
+        if (keystorePropertiesFile.exists()) {
+            release {
+                keyAlias keystoreProperties["keyAlias"]
+                keyPassword keystoreProperties["keyPassword"]
+                storeFile file(keystoreProperties["storeFile"])
+                storePassword keystoreProperties["storePassword"]
+            }
+        }
     }
 
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            if (keystorePropertiesFile.exists()) {
+                signingConfig signingConfigs.release
+            } else {
+                signingConfig signingConfigs.debug
+            }
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    source = "../.."
 }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0ada180..9cc1858 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,55 +1,59 @@
-<manifest
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        package="app.thomasclark.albumsearcherforgooglephotos">
-    <uses-permission android:name="android.permission.INTERNET"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission
+            android:name="android.permission.INTERNET"
+    />
     <application
             android:label="Album Searcher for Google Photos"
+            android:name="${applicationName}"
             android:icon="@mipmap/ic_launcher"
-            android:roundIcon="@mipmap/ic_launcher_round">
+    >
         <activity
                 android:name=".MainActivity"
+                android:exported="true"
                 android:launchMode="singleTop"
+                android:taskAffinity=""
                 android:theme="@style/LaunchTheme"
                 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
                 android:hardwareAccelerated="true"
-                android:windowSoftInputMode="adjustResize">
+                android:windowSoftInputMode="adjustResize"
+        >
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
                     android:name="io.flutter.embedding.android.NormalTheme"
-                    android:resource="@style/NormalTheme"/>
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-                    android:name="io.flutter.embedding.android.SplashScreenDrawable"
-                    android:resource="@drawable/launch_background"/>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+                    android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="app.thomasclark.albumsearcherforgooglephotos"/>
+                <action
+                        android:name="android.intent.action.MAIN"
+                />
+                <category
+                        android:name="android.intent.category.LAUNCHER"
+                />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
                 android:name="flutterEmbedding"
-                android:value="2"/>
+                android:value="2"
+        />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.VIEW"/>
-            <category android:name="android.intent.category.BROWSABLE"/>
-            <data android:scheme="https"/>
+            <action
+                    android:name="android.intent.action.PROCESS_TEXT"
+            />
+            <data
+                    android:mimeType="text/plain"
+            />
         </intent>
     </queries>
 </manifest>
diff --git a/android/app/src/main/ic_launcher-playstore.png b/android/app/src/main/ic_launcher-playstore.png
deleted file mode 100644
index 7ab59c7..0000000
Binary files a/android/app/src/main/ic_launcher-playstore.png and /dev/null differ
diff --git a/android/app/src/main/kotlin/app/thomasclark/albumsearcherforgooglephotos/MainActivity.kt b/android/app/src/main/kotlin/app/thomasclark/albumsearcherforgooglephotos/MainActivity.kt
deleted file mode 100644
index b0751fd..0000000
--- a/android/app/src/main/kotlin/app/thomasclark/albumsearcherforgooglephotos/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package app.thomasclark.albumsearcherforgooglephotos
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/app/src/main/kotlin/app/thomasclark/googlephotosalbumsearcher/MainActivity.kt b/android/app/src/main/kotlin/app/thomasclark/googlephotosalbumsearcher/MainActivity.kt
new file mode 100644
index 0000000..8c916fd
--- /dev/null
+++ b/android/app/src/main/kotlin/app/thomasclark/googlephotosalbumsearcher/MainActivity.kt
@@ -0,0 +1,5 @@
+package app.thomasclark.googlephotosalbumsearcher
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/android/app/src/main/play_store.png b/android/app/src/main/play_store.png
new file mode 100644
index 0000000..c5bc9e1
Binary files /dev/null and b/android/app/src/main/play_store.png differ
diff --git a/android/app/src/main/play_store_feature_graphic.png b/android/app/src/main/play_store_feature_graphic.png
new file mode 100644
index 0000000..81e1c51
Binary files /dev/null and b/android/app/src/main/play_store_feature_graphic.png differ
diff --git a/android/app/src/main/res/drawable-v21/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v21/ic_launcher_foreground.xml
deleted file mode 100644
index 0cf2e52..0000000
--- a/android/app/src/main/res/drawable-v21/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.25"
-      android:scaleY="2.25"
-      android:translateX="27"
-      android:translateY="27">
-    <path
-        android:pathData="M15.5,2C18,2 20,4 20,6.5C20,7.38 19.75,8.21 19.31,8.9L22.39,12L21,13.39L17.88,10.32C17.19,10.75 16.37,11 15.5,11C13,11 11,9 11,6.5C11,4 13,2 15.5,2M15.5,4A2.5,2.5 0,0 0,13 6.5A2.5,2.5 0,0 0,15.5 9A2.5,2.5 0,0 0,18 6.5A2.5,2.5 0,0 0,15.5 4M7.5,14.5L4,19H18L13.5,13L10,17.5L7.5,14.5M20,20A2,2 0,0 1,18 22H4A2,2 0,0 1,2 20V6A2,2 0,0 1,4 4H9.5C9.18,4.77 9,5.61 9,6.5A6.5,6.5 0,0 0,15.5 13C16.18,13 16.84,12.89 17.46,12.7L20,15.24V20Z"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 0cf2e52..0000000
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.25"
-      android:scaleY="2.25"
-      android:translateX="27"
-      android:translateY="27">
-    <path
-        android:pathData="M15.5,2C18,2 20,4 20,6.5C20,7.38 19.75,8.21 19.31,8.9L22.39,12L21,13.39L17.88,10.32C17.19,10.75 16.37,11 15.5,11C13,11 11,9 11,6.5C11,4 13,2 15.5,2M15.5,4A2.5,2.5 0,0 0,13 6.5A2.5,2.5 0,0 0,15.5 9A2.5,2.5 0,0 0,18 6.5A2.5,2.5 0,0 0,15.5 4M7.5,14.5L4,19H18L13.5,13L10,17.5L7.5,14.5M20,20A2,2 0,0 1,18 22H4A2,2 0,0 1,2 20V6A2,2 0,0 1,4 4H9.5C9.18,4.77 9,5.61 9,6.5A6.5,6.5 0,0 0,15.5 13C16.18,13 16.84,12.89 17.46,12.7L20,15.24V20Z"
-        android:fillColor="#ffffff"
-        android:strokeColor="#00000000"/>
-  </group>
-</vector>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 7353dbd..345888d 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 7353dbd..0000000
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 50fdde0..bc33974 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..1966948
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..736302f
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..babed03
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index d3903f9..0000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 0e3f7fc..f8853a2 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..75025cf
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..38bbd25
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..5c8dc46
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 842ef94..0000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index e04d58e..6b4412f 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..9784f16
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..3741dbc
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..ac33b83
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 2811ebc..0000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index aebb98d..1ce255d 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..04ef206
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..23d236c
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..28ce72b
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index dac4f15..0000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 3347fde..36ef834 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..66a5487
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..a65e8e4
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..168abc3
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index a2f1a74..0000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/values-night/ic_launcher_background.xml b/android/app/src/main/res/values-night/ic_launcher_background.xml
deleted file mode 100644
index 07e4b80..0000000
--- a/android/app/src/main/res/values-night/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#F44336</color>
-</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 449a9f9..06952be 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml
deleted file mode 100644
index 07e4b80..0000000
--- a/android/app/src/main/res/values/ic_launcher_background.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#F44336</color>
-</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index d74aa35..cb1ef88 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+</manifest>
diff --git a/android/build.gradle b/android/build.gradle
index c505a86..d2ffbff 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,31 +1,18 @@
-buildscript {
-    ext.kotlin_version = '1.3.50'
-    repositories {
-        google()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a..3b5b324 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58a..e1ca574 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..7fb86d7 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,28 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    // START: FlutterFire Configuration
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    // END: FlutterFire Configuration
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+}
+
+include ":app"
diff --git a/archive.tar.gpg b/archive.tar.gpg
new file mode 100644
index 0000000..f436c66
Binary files /dev/null and b/archive.tar.gpg differ
diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 0000000..fa0b357
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/files/browser_client_secret.json.gpg b/files/browser_client_secret.json.gpg
deleted file mode 100644
index fd66024..0000000
Binary files a/files/browser_client_secret.json.gpg and /dev/null differ
diff --git a/files/desktop_client_secret.json.gpg b/files/desktop_client_secret.json.gpg
deleted file mode 100644
index 8602e40..0000000
Binary files a/files/desktop_client_secret.json.gpg and /dev/null differ
diff --git a/firebase.json b/firebase.json
index 6603732..13e4122 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,4 +1,26 @@
 {
+  "flutter": {
+    "platforms": {
+      "android": {
+        "default": {
+          "projectId": "tidal-run-307407",
+          "appId": "1:6114165025:android:9acb8b47877ba9272a3e60",
+          "fileOutput": "android/app/google-services.json"
+        }
+      },
+      "dart": {
+        "lib/firebase_options.dart": {
+          "projectId": "tidal-run-307407",
+          "configurations": {
+            "android": "1:6114165025:android:9acb8b47877ba9272a3e60",
+            "linux": "1:6114165025:web:55f3376c52ca07eb2a3e60",
+            "web": "1:6114165025:web:db9d0d28d53173192a3e60",
+            "windows": "1:6114165025:web:540318e30ae9d1e72a3e60"
+          }
+        }
+      }
+    }
+  },
   "hosting": {
     "public": "build/web",
     "ignore": [
diff --git a/images/1.5x/image-search.png b/images/1.5x/image-search.png
new file mode 100644
index 0000000..c851580
Binary files /dev/null and b/images/1.5x/image-search.png differ
diff --git a/images/2.0x/image-search.png b/images/2.0x/image-search.png
new file mode 100644
index 0000000..1d0318b
Binary files /dev/null and b/images/2.0x/image-search.png differ
diff --git a/images/3.0x/image-search.png b/images/3.0x/image-search.png
new file mode 100644
index 0000000..748de72
Binary files /dev/null and b/images/3.0x/image-search.png differ
diff --git a/images/4.0x/image-search.png b/images/4.0x/image-search.png
new file mode 100644
index 0000000..753e076
Binary files /dev/null and b/images/4.0x/image-search.png differ
diff --git a/images/image-search.png b/images/image-search.png
new file mode 100644
index 0000000..4a9faa0
Binary files /dev/null and b/images/image-search.png differ
diff --git a/images/image-search.svg b/images/image-search.svg
index 3215e9f..59ab82a 100644
--- a/images/image-search.svg
+++ b/images/image-search.svg
@@ -1,4 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24" height="24" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
- <path d="m15.305 2c2.5 0 4.5 2 4.5 4.5 0 0.88-0.25 1.71-0.69 2.4l3.08 3.1-1.39 1.39-3.12-3.07c-0.69 0.43-1.51 0.68-2.38 0.68-2.5 0-4.5-2-4.5-4.5s2-4.5 4.5-4.5m0 2a2.5 2.5 0 0 0-2.5 2.5 2.5 2.5 0 0 0 2.5 2.5 2.5 2.5 0 0 0 2.5-2.5 2.5 2.5 0 0 0-2.5-2.5m-8 10.5-3.5 4.5h14l-4.5-6-3.5 4.5-2.5-3m12.5 5.5a2 2 0 0 1-2 2h-14a2 2 0 0 1-2-2v-14a2 2 0 0 1 2-2h5.5c-0.32 0.77-0.5 1.61-0.5 2.5a6.5 6.5 0 0 0 6.5 6.5c0.68 0 1.34-0.11 1.96-0.3l2.54 2.54z" fill="#fff"/>
-</svg>
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m5 21q-0.825 0-1.4125-0.5875-0.5875-0.5875-0.5875-1.4125v-14q0-0.825 0.5875-1.4125 0.5875-0.5875 1.4125-0.5875h5v2h-5v14h14v-5.35l2 2v3.35q0 0.825-0.5875 1.4125t-1.4125 0.5875zm1-4 3-4 2.25 3 3-4 3.75 5zm15.55-3.6-3.1-3.1q-0.525 0.35-1.125 0.525t-1.275 0.175q-1.85 0-3.15-1.3125t-1.3-3.1875 1.3125-3.1875 3.1875-1.3125 3.1875 1.3125q1.3125 1.3125 1.3125 3.1875 0 0.675-0.2 1.3-0.2 0.625-0.5 1.15l3.05 3.05zm-5.45-4.4q1.05 0 1.775-0.725t0.725-1.775-0.725-1.775-1.775-0.725-1.775 0.725-0.725 1.775 0.725 1.775 1.775 0.725z" fill="#ea4335"/></svg>
diff --git a/lib/albums/album_card.dart b/lib/albums/album_card.dart
new file mode 100644
index 0000000..3fefa13
--- /dev/null
+++ b/lib/albums/album_card.dart
@@ -0,0 +1,84 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+import 'package:provider/provider.dart';
+
+import '../media_items/media_item_repository.dart';
+
+class AlbumCard extends StatefulWidget {
+  const AlbumCard({
+    super.key,
+    required this.album,
+  });
+
+  final Album album;
+
+  @override
+  State<AlbumCard> createState() {
+    return _AlbumCardState();
+  }
+}
+
+class _AlbumCardState extends State<AlbumCard> {
+  late final Future<MediaItem?>? _future;
+
+  @override
+  Widget build(BuildContext context) {
+    final child = InkWell(
+      onTap: () {
+        context.go('/albums/${widget.album.id}');
+      },
+      child: Container(
+        alignment: Alignment.bottomCenter,
+        padding: const EdgeInsets.all(8),
+        child: Text(
+          widget.album.title ?? widget.album.id ?? '',
+          style: const TextStyle(
+            color: Colors.white,
+          ),
+          overflow: TextOverflow.ellipsis,
+          maxLines: 1,
+        ),
+      ),
+    );
+
+    if (_future case final future?) {
+      return Card(
+        clipBehavior: Clip.antiAlias,
+        child: FutureBuilder(
+          future: future,
+          builder: (context, snapshot) {
+            if (snapshot.data?.baseUrl case final baseUrl?) {
+              return Ink.image(
+                image: NetworkImage(
+                  '$baseUrl=w256-h256',
+                ),
+                colorFilter: const ColorFilter.mode(
+                  Color.fromRGBO(0, 0, 0, 0.5),
+                  BlendMode.darken,
+                ),
+                fit: BoxFit.cover,
+                child: child,
+              );
+            }
+
+            return child;
+          },
+        ),
+      );
+    }
+
+    return Card(
+      clipBehavior: Clip.antiAlias,
+      child: child,
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.album.coverPhotoMediaItemId case final mediaItemId?) {
+      _future = context.read<MediaItemRepository>().get(mediaItemId);
+    }
+  }
+}
diff --git a/lib/widgets/album_list_tile.dart b/lib/albums/album_list_tile.dart
similarity index 56%
rename from lib/widgets/album_list_tile.dart
rename to lib/albums/album_list_tile.dart
index 4ce3a70..5d1426c 100644
--- a/lib/widgets/album_list_tile.dart
+++ b/lib/albums/album_list_tile.dart
@@ -1,25 +1,25 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
 
 class AlbumListTile extends StatelessWidget {
-  final Album album;
-
   const AlbumListTile({
-    Key? key,
+    super.key,
     required this.album,
-  }) : super(key: key);
+  });
+
+  final Album album;
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
       title: Text(
-        album.title ?? album.id,
+        album.title ?? album.id ?? '',
         overflow: TextOverflow.ellipsis,
         maxLines: 1,
       ),
       onTap: () {
-        RouterState.of(context).selectedAlbum = album.id;
+        context.go('/albums/${album.id}');
       },
     );
   }
diff --git a/lib/albums/album_repository.dart b/lib/albums/album_repository.dart
new file mode 100644
index 0000000..b7a3d16
--- /dev/null
+++ b/lib/albums/album_repository.dart
@@ -0,0 +1,74 @@
+import 'dart:collection';
+
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import '../common/paginator.dart';
+
+class AlbumRepository {
+  final PhotosLibraryApi _photosLibraryApi;
+
+  const AlbumRepository({
+    required PhotosLibraryApi photosLibraryApi,
+  }) : _photosLibraryApi = photosLibraryApi;
+
+  Future<Album?> get(String albumId) async {
+    try {
+      return await _photosLibraryApi.albums.get(albumId);
+    } catch (e) {
+      // ignored because the identifier could be for a shared album
+    }
+
+    try {
+      return await _photosLibraryApi.sharedAlbums.get(albumId);
+    } catch (e) {
+      // ignored because null is returned when the album is not found
+    }
+
+    return null;
+  }
+
+  Future<List<Album>> list() async {
+    final albums = HashSet<Album>(
+      equals: (a, b) {
+        return a.id == b.id;
+      },
+      hashCode: (a) {
+        return a.id.hashCode;
+      },
+    );
+
+    albums.addAll(
+      await paginator<Album, ListAlbumsResponse>(
+        (pageToken) {
+          return _photosLibraryApi.albums.list(pageToken: pageToken);
+        },
+        (response) {
+          return response.nextPageToken;
+        },
+        (response) {
+          return response.albums;
+        },
+      ).expand((albums) {
+        return albums;
+      }).toList(),
+    );
+
+    albums.addAll(
+      await paginator<Album, ListSharedAlbumsResponse>(
+        (pageToken) {
+          return _photosLibraryApi.sharedAlbums.list(pageToken: pageToken);
+        },
+        (response) {
+          return response.nextPageToken;
+        },
+        (response) {
+          return response.sharedAlbums;
+        },
+      ).expand((albums) {
+        return albums;
+      }).toList(),
+    );
+
+    return albums.toList();
+  }
+}
diff --git a/lib/albums/album_screen.dart b/lib/albums/album_screen.dart
new file mode 100644
index 0000000..107bd38
--- /dev/null
+++ b/lib/albums/album_screen.dart
@@ -0,0 +1,144 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+import 'package:provider/provider.dart';
+
+import '../media_items/media_item_repository.dart';
+import '../media_items/media_item_sliver_grid.dart';
+import '../media_items/media_item_sliver_list.dart';
+import '../settings/theme_notifier.dart';
+import 'album_repository.dart';
+import 'album_sliver_app_bar.dart';
+
+class AlbumScreen extends StatefulWidget {
+  const AlbumScreen({
+    super.key,
+    required this.albumId,
+  });
+
+  final String albumId;
+
+  @override
+  State<AlbumScreen> createState() {
+    return _AlbumScreenState();
+  }
+}
+
+class _AlbumScreenState extends State<AlbumScreen> {
+  late final Future<(Album?, List<MediaItem>)> _future;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: FutureBuilder(
+          future: _future,
+          builder: (context, snapshot) {
+            if (snapshot.data case final data?) {
+              if (data.$1 case final album?) {
+                return _CustomScrollView(
+                  album: album,
+                  mediaItems: data.$2,
+                );
+              }
+
+              return Center(
+                child: Text(
+                  'Failed to find the album \'${widget.albumId}\'.',
+                ),
+              );
+            }
+
+            if (snapshot.error case final error?) {
+              return Center(
+                child: Text('$error'),
+              );
+            }
+
+            return const Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: CircularProgressIndicator(),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: Text('Getting photos from Google Photos.'),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: Text('This might take a few seconds.'),
+                  ),
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _future = (
+      context.read<AlbumRepository>().get(widget.albumId),
+      context.read<MediaItemRepository>().search(widget.albumId),
+    ).wait;
+  }
+}
+
+class _CustomScrollView extends StatelessWidget {
+  const _CustomScrollView({
+    super.key,
+    required this.album,
+    required this.mediaItems,
+  });
+
+  final Album album;
+
+  final List<MediaItem> mediaItems;
+
+  @override
+  Widget build(BuildContext context) {
+    return CustomScrollView(
+      slivers: [
+        AlbumSliverAppBar(
+          album: album,
+        ),
+        switch (context.select<ThemeNotifier, LayoutMode>(
+          (notifier) {
+            return notifier.layoutMode;
+          },
+        )) {
+          LayoutMode.grid => SliverPadding(
+              padding: const EdgeInsets.all(2),
+              sliver: MediaItemSliverGrid(
+                mediaItems: mediaItems..sort(_comparator),
+              ),
+            ),
+          LayoutMode.list => MediaItemSliverList(
+              mediaItems: mediaItems..sort(_comparator),
+            ),
+        },
+      ],
+    );
+  }
+
+  static int _comparator(MediaItem a, MediaItem b) {
+    final x = a.mediaMetadata?.creationTime;
+    final y = b.mediaMetadata?.creationTime;
+
+    if (x != null && y != null) {
+      return x.compareTo(y);
+    } else if (x != null) {
+      return -1;
+    } else if (y != null) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
+}
diff --git a/lib/albums/album_sliver_app_bar.dart b/lib/albums/album_sliver_app_bar.dart
new file mode 100644
index 0000000..d992f46
--- /dev/null
+++ b/lib/albums/album_sliver_app_bar.dart
@@ -0,0 +1,88 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+import 'package:provider/provider.dart';
+
+import '../common/open_in_google_photos_icon_button.dart';
+import '../media_items/media_item_repository.dart';
+
+class AlbumSliverAppBar extends StatefulWidget {
+  const AlbumSliverAppBar({
+    super.key,
+    required this.album,
+  });
+
+  final Album album;
+
+  @override
+  State<AlbumSliverAppBar> createState() {
+    return _AlbumSliverAppBarState();
+  }
+}
+
+class _AlbumSliverAppBarState extends State<AlbumSliverAppBar> {
+  late final Future<MediaItem?>? _future;
+
+  @override
+  Widget build(BuildContext context) {
+    final actions = [
+      if (widget.album.productUrl case final productUrl?)
+        OpenInGooglePhotosIconButton(
+          productUrl: productUrl,
+        ),
+    ];
+
+    if (_future case final future?) {
+      return SliverAppBar(
+        actions: actions,
+        flexibleSpace: FlexibleSpaceBar(
+          title: Text(
+            widget.album.title ?? widget.album.id ?? '',
+            style: const TextStyle(
+              color: Colors.white,
+            ),
+            overflow: TextOverflow.ellipsis,
+            maxLines: 1,
+          ),
+          background: FutureBuilder(
+            future: future,
+            builder: (context, snapshot) {
+              if (snapshot.data?.baseUrl case final baseUrl?) {
+                return Image.network(
+                  '$baseUrl=w1024-h512',
+                  color: const Color.fromRGBO(0, 0, 0, 0.5),
+                  colorBlendMode: BlendMode.darken,
+                  fit: BoxFit.cover,
+                );
+              } else {
+                return Container();
+              }
+            },
+          ),
+        ),
+        iconTheme: const IconThemeData(
+          color: Colors.white,
+        ),
+        expandedHeight: MediaQuery.sizeOf(context).height * 0.5,
+        pinned: true,
+      );
+    }
+
+    return SliverAppBar(
+      title: Text(
+        widget.album.title ?? widget.album.id ?? '',
+        overflow: TextOverflow.ellipsis,
+        maxLines: 1,
+      ),
+      actions: actions,
+      pinned: true,
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.album.coverPhotoMediaItemId case final mediaItemId?) {
+      _future = context.read<MediaItemRepository>().get(mediaItemId);
+    }
+  }
+}
diff --git a/lib/albums/album_sliver_grid.dart b/lib/albums/album_sliver_grid.dart
new file mode 100644
index 0000000..8037020
--- /dev/null
+++ b/lib/albums/album_sliver_grid.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import 'album_card.dart';
+
+class AlbumSliverGrid extends StatelessWidget {
+  const AlbumSliverGrid({
+    super.key,
+    required this.albums,
+  });
+
+  final List<Album> albums;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverGrid.builder(
+      gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+        maxCrossAxisExtent: 250,
+        mainAxisSpacing: 12,
+        crossAxisSpacing: 12,
+      ),
+      itemBuilder: (context, index) {
+        return AlbumCard(
+          key: ValueKey(albums[index]),
+          album: albums[index],
+        );
+      },
+      itemCount: albums.length,
+    );
+  }
+}
diff --git a/lib/albums/album_sliver_list.dart b/lib/albums/album_sliver_list.dart
new file mode 100644
index 0000000..97345ff
--- /dev/null
+++ b/lib/albums/album_sliver_list.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import 'album_list_tile.dart';
+
+class AlbumSliverList extends StatelessWidget {
+  const AlbumSliverList({
+    super.key,
+    required this.albums,
+  });
+
+  final List<Album> albums;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverList.builder(
+      itemBuilder: (context, index) {
+        return AlbumListTile(
+          key: ValueKey(albums[index]),
+          album: albums[index],
+        );
+      },
+      itemCount: albums.length,
+    );
+  }
+}
diff --git a/lib/albums/albums_screen.dart b/lib/albums/albums_screen.dart
new file mode 100644
index 0000000..2140949
--- /dev/null
+++ b/lib/albums/albums_screen.dart
@@ -0,0 +1,163 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+import 'package:provider/provider.dart';
+
+import '../common/search_text_field.dart';
+import '../common/sliver_search_bar_delegate.dart';
+import '../common/string_extensions.dart';
+import '../settings/theme_notifier.dart';
+import 'album_repository.dart';
+import 'album_sliver_grid.dart';
+import 'album_sliver_list.dart';
+
+class AlbumsScreen extends StatefulWidget {
+  const AlbumsScreen({
+    super.key,
+  });
+
+  @override
+  State<AlbumsScreen> createState() {
+    return _AlbumsScreenState();
+  }
+}
+
+class _AlbumsScreenState extends State<AlbumsScreen> {
+  late final Future<List<Album>> _future;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: FutureBuilder(
+          future: _future,
+          builder: (context, snapshot) {
+            if (snapshot.data case var albums?) {
+              return _CustomScrollView(
+                albums: albums,
+              );
+            }
+
+            if (snapshot.error case final error?) {
+              return Center(
+                child: Text('$error'),
+              );
+            }
+
+            return const Center(
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: CircularProgressIndicator(),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: Text('Caching albums from Google Photos.'),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(8),
+                    child: Text('This might take a few minutes.'),
+                  ),
+                ],
+              ),
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _future = context.read<AlbumRepository>().list();
+  }
+}
+
+class _CustomScrollView extends StatefulWidget {
+  const _CustomScrollView({
+    super.key,
+    required this.albums,
+  });
+
+  final List<Album> albums;
+
+  @override
+  State<_CustomScrollView> createState() {
+    return _CustomScrollViewState();
+  }
+}
+
+class _CustomScrollViewState extends State<_CustomScrollView> {
+  String? _query;
+
+  @override
+  Widget build(BuildContext context) {
+    var albums = widget.albums;
+
+    if (_query case final query? when query.isNotEmpty) {
+      albums = albums.where(
+        (album) {
+          if (album.title case final title?) {
+            return title.uglify().contains(query.uglify());
+          } else {
+            return false;
+          }
+        },
+      ).toList();
+    }
+
+    return CustomScrollView(
+      slivers: [
+        SliverPersistentHeader(
+          delegate: SliverSearchBarDelegate(
+            child: SearchTextField(
+              onChanged: (value) {
+                setState(() {
+                  _query = value;
+                });
+              },
+            ),
+          ),
+          floating: true,
+        ),
+        switch (context.select<ThemeNotifier, LayoutMode>(
+          (notifier) {
+            return notifier.layoutMode;
+          },
+        )) {
+          LayoutMode.grid => SliverPadding(
+              padding: const EdgeInsets.only(
+                left: 16,
+                right: 16,
+                bottom: 16,
+              ),
+              sliver: AlbumSliverGrid(
+                albums: albums..sort(_comparator),
+              ),
+            ),
+          LayoutMode.list => AlbumSliverList(
+              albums: albums..sort(_comparator),
+            ),
+        },
+      ],
+    );
+  }
+
+  static int _comparator(Album a, Album b) {
+    final x = a.title;
+    final y = b.title;
+
+    if (x != null && y != null) {
+      return x.compareTo(y);
+    } else if (x != null) {
+      return -1;
+    } else if (y != null) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }
+}
diff --git a/lib/albums/caching_album_repository.dart b/lib/albums/caching_album_repository.dart
new file mode 100644
index 0000000..940d727
--- /dev/null
+++ b/lib/albums/caching_album_repository.dart
@@ -0,0 +1,71 @@
+import 'dart:convert';
+
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import '../common/cache_service.dart';
+import 'album_repository.dart';
+
+class CachingAlbumRepository implements AlbumRepository {
+  final AlbumRepository _inner;
+  final CacheService _cacheService;
+
+  const CachingAlbumRepository({
+    required AlbumRepository inner,
+    required CacheService cacheService,
+  })  : _inner = inner,
+        _cacheService = cacheService;
+
+  @override
+  Future<Album?> get(String albumId) async {
+    try {
+      if (await _cacheService._get() case final albums?) {
+        return albums.where((album) {
+          return album.id == albumId;
+        }).singleOrNull;
+      }
+    } catch (e) {
+      // ignored because the album is gotten from inner below
+    }
+
+    return await _inner.get(albumId);
+  }
+
+  @override
+  Future<List<Album>> list() async {
+    try {
+      if (await _cacheService._get() case final albums?) {
+        return albums;
+      }
+    } catch (e) {
+      // ignored because the albums are listed from inner below
+    }
+
+    final albums = await _inner.list();
+
+    try {
+      await _cacheService._set(albums);
+    } catch (e) {
+      // ignored because we disregard cache set exceptions
+    }
+
+    return albums;
+  }
+}
+
+extension _CacheServiceExtension on CacheService {
+  static const _key = 'albums.json';
+
+  Future<List<Album>?> _get() async {
+    if (await get(_key) case final source?) {
+      return (json.decode(source) as Iterable<dynamic>).map((json_) {
+        return Album.fromJson(json_);
+      }).toList();
+    } else {
+      return null;
+    }
+  }
+
+  Future<void> _set(List<Album>? albums) async {
+    await set(_key, albums != null ? json.encode(albums) : null);
+  }
+}
diff --git a/lib/authentication/authenticating_client.dart b/lib/authentication/authenticating_client.dart
new file mode 100644
index 0000000..edca7bd
--- /dev/null
+++ b/lib/authentication/authenticating_client.dart
@@ -0,0 +1,43 @@
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:http/http.dart';
+import 'package:http/retry.dart';
+
+class AuthenticatingClient extends BaseClient {
+  AuthenticatingClient({
+    Client? inner,
+    required GoogleSignIn googleSignIn,
+  }) : _googleSignIn = googleSignIn {
+    _inner = RetryClient(
+      inner ?? Client(),
+      retries: 1,
+      when: (response) {
+        return response.statusCode == 401;
+      },
+      onRetry: (request, response, retryCount) async {
+        await _googleSignIn.currentUser?.clearAuthCache();
+
+        _authentication = await _googleSignIn.currentUser?.authentication;
+
+        if (_authentication?.accessToken case final accessToken?) {
+          request.headers['authorization'] = 'Bearer $accessToken';
+        }
+      },
+    );
+  }
+
+  late final Client _inner;
+  final GoogleSignIn _googleSignIn;
+
+  GoogleSignInAuthentication? _authentication;
+
+  @override
+  Future<StreamedResponse> send(BaseRequest request) async {
+    _authentication ??= await _googleSignIn.currentUser?.authentication;
+
+    if (_authentication?.accessToken case final accessToken?) {
+      request.headers['authorization'] = 'Bearer $accessToken';
+    }
+
+    return await _inner.send(request);
+  }
+}
diff --git a/lib/authentication/google_sign_in_account_notifier.dart b/lib/authentication/google_sign_in_account_notifier.dart
new file mode 100644
index 0000000..6749393
--- /dev/null
+++ b/lib/authentication/google_sign_in_account_notifier.dart
@@ -0,0 +1,12 @@
+import 'package:google_sign_in/google_sign_in.dart';
+
+import '../common/stream_notifier.dart';
+
+class GoogleSignInAccountNotifier extends StreamNotifier<GoogleSignInAccount?> {
+  GoogleSignInAccountNotifier({
+    required GoogleSignIn googleSignIn,
+  }) : super(
+          stream: googleSignIn.onCurrentUserChanged,
+          initialValue: null,
+        );
+}
diff --git a/lib/authentication/google_sign_in_desktop_token_data_store.dart b/lib/authentication/google_sign_in_desktop_token_data_store.dart
new file mode 100644
index 0000000..f52b5a8
--- /dev/null
+++ b/lib/authentication/google_sign_in_desktop_token_data_store.dart
@@ -0,0 +1,46 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:google_sign_in_desktop/google_sign_in_desktop.dart';
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+
+class GoogleSignInDesktopTokenDataStore
+    implements GoogleSignInDesktopStore<GoogleSignInDesktopTokenData> {
+  static const _basename = 'tokens.json';
+
+  const GoogleSignInDesktopTokenDataStore();
+
+  @override
+  Future<GoogleSignInDesktopTokenData?> get() async {
+    final directory = await getApplicationSupportDirectory();
+
+    final file = File(join(directory.path, _basename));
+    if (!await file.exists()) {
+      return null;
+    }
+
+    final text = await file.readAsString();
+    if (text.isEmpty) {
+      return null;
+    }
+
+    return GoogleSignInDesktopTokenData.fromJson(json.decode(text));
+  }
+
+  @override
+  Future<void> set(GoogleSignInDesktopTokenData? value) async {
+    final directory = await getApplicationSupportDirectory();
+
+    final file = File(join(directory.path, _basename));
+    if (!await file.exists()) {
+      await file.create();
+    }
+
+    if (value != null) {
+      await file.writeAsString(json.encode(value));
+    } else {
+      await file.delete();
+    }
+  }
+}
diff --git a/lib/authentication/sign_in_button.dart b/lib/authentication/sign_in_button.dart
new file mode 100644
index 0000000..cf56051
--- /dev/null
+++ b/lib/authentication/sign_in_button.dart
@@ -0,0 +1,3 @@
+export 'sign_in_button_stub.dart'
+    if (dart.library.io) 'sign_in_button_io.dart'
+    if (dart.library.js_interop) 'sign_in_button_web.dart';
diff --git a/lib/authentication/sign_in_button_io.dart b/lib/authentication/sign_in_button_io.dart
new file mode 100644
index 0000000..22619b8
--- /dev/null
+++ b/lib/authentication/sign_in_button_io.dart
@@ -0,0 +1,61 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:provider/provider.dart';
+
+import 'google_sign_in_account_notifier.dart';
+
+Widget createSignInButton() {
+  return const SignInButtonIo();
+}
+
+class SignInButtonIo extends StatefulWidget {
+  const SignInButtonIo({
+    super.key,
+  });
+
+  @override
+  State<SignInButtonIo> createState() {
+    return _SignInButtonIoState();
+  }
+}
+
+class _SignInButtonIoState extends State<SignInButtonIo> {
+  @override
+  Widget build(BuildContext context) {
+    if (context.watch<GoogleSignInAccountNotifier>().value != null) {
+      return ElevatedButton(
+        onPressed: () async {
+          context.go('/albums');
+        },
+        child: const Text('CONTINUE'),
+      );
+    }
+
+    return ElevatedButton(
+      onPressed: () async {
+        final googleSignIn = context.read<GoogleSignIn>();
+        final router = GoRouter.of(context);
+
+        if (await googleSignIn.signIn() != null) {
+          if (defaultTargetPlatform == TargetPlatform.android) {
+            await FirebaseAnalytics.instance.logLogin(
+              loginMethod: 'Google',
+            );
+          }
+
+          router.go('/albums');
+        }
+      },
+      child: const Text('SIGN IN'),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<GoogleSignIn>().signInSilently();
+  }
+}
diff --git a/lib/authentication/sign_in_button_stub.dart b/lib/authentication/sign_in_button_stub.dart
new file mode 100644
index 0000000..3fb91d8
--- /dev/null
+++ b/lib/authentication/sign_in_button_stub.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+Widget createSignInButton() {
+  return const SignInButtonStub();
+}
+
+class SignInButtonStub extends StatelessWidget {
+  const SignInButtonStub({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    throw UnimplementedError();
+  }
+}
diff --git a/lib/authentication/sign_in_button_web.dart b/lib/authentication/sign_in_button_web.dart
new file mode 100644
index 0000000..1e8548d
--- /dev/null
+++ b/lib/authentication/sign_in_button_web.dart
@@ -0,0 +1,61 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:google_sign_in_web/web_only.dart';
+import 'package:provider/provider.dart';
+
+import 'google_sign_in_account_notifier.dart';
+
+Widget createSignInButton() {
+  return const SignInButtonWeb();
+}
+
+class SignInButtonWeb extends StatefulWidget {
+  const SignInButtonWeb({
+    super.key,
+  });
+
+  @override
+  State<SignInButtonWeb> createState() {
+    return _SignInButtonWebState();
+  }
+}
+
+class _SignInButtonWebState extends State<SignInButtonWeb> {
+  @override
+  Widget build(BuildContext context) {
+    if (context.watch<GoogleSignInAccountNotifier>().value != null) {
+      return ElevatedButton(
+        onPressed: () async {
+          final googleSignIn = context.read<GoogleSignIn>();
+          final router = GoRouter.of(context);
+
+          if (await googleSignIn.requestScopes(googleSignIn.scopes)) {
+            await FirebaseAnalytics.instance.logLogin(
+              loginMethod: 'Google',
+            );
+
+            router.go('/albums');
+          }
+        },
+        child: const Text('GRANT CONSENT'),
+      );
+    }
+
+    return renderButton(
+      configuration: GSIButtonConfiguration(
+        theme: switch (Theme.of(context).brightness) {
+          Brightness.dark => GSIButtonTheme.filledBlack,
+          Brightness.light => GSIButtonTheme.filledBlue,
+        },
+      ),
+    );
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    context.read<GoogleSignIn>().signInSilently();
+  }
+}
diff --git a/lib/authentication/sign_in_card.dart b/lib/authentication/sign_in_card.dart
new file mode 100644
index 0000000..5f5ba47
--- /dev/null
+++ b/lib/authentication/sign_in_card.dart
@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+
+import '../common/terms_of_service_text.dart';
+import 'sign_in_button.dart';
+
+class SignInCard extends StatelessWidget {
+  const SignInCard({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.all(8),
+      child: Padding(
+        padding: const EdgeInsets.all(8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            const Padding(
+              padding: EdgeInsets.all(8),
+              child: Text(
+                'Sign in with Google to continue to Album Searcher for Google Photos.',
+                textAlign: TextAlign.center,
+              ),
+            ),
+            const Padding(
+              padding: EdgeInsets.all(8),
+              child: Text(
+                'Album Searcher for Google Photos will have read access to your photos library.',
+                textAlign: TextAlign.center,
+              ),
+            ),
+            const Padding(
+              padding: EdgeInsets.all(8),
+              child: TermsOfServiceText(),
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8),
+              child: createSignInButton(),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/authentication/sign_in_screen.dart b/lib/authentication/sign_in_screen.dart
new file mode 100644
index 0000000..2bf7e62
--- /dev/null
+++ b/lib/authentication/sign_in_screen.dart
@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+
+import '../common/welcome_card.dart';
+import 'sign_in_card.dart';
+
+class SignInScreen extends StatelessWidget {
+  const SignInScreen({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: Center(
+          child: ConstrainedBox(
+            constraints: const BoxConstraints(
+              maxWidth: 800,
+            ),
+            child: const Padding(
+              padding: EdgeInsets.all(8),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  WelcomeCard(),
+                  SignInCard(),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/authentication/sign_out_button.dart b/lib/authentication/sign_out_button.dart
new file mode 100644
index 0000000..1e276bc
--- /dev/null
+++ b/lib/authentication/sign_out_button.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:provider/provider.dart';
+
+import '../common/cache_service.dart';
+
+class SignOutButton extends StatelessWidget {
+  const SignOutButton({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton.icon(
+      onPressed: () async {
+        final cacheService = context.read<CacheService>();
+        final googleSignIn = context.read<GoogleSignIn>();
+        final router = GoRouter.of(context);
+
+        await cacheService.clear();
+        await googleSignIn.signOut();
+        router.go('/signin');
+      },
+      icon: const Icon(Icons.logout),
+      label: const Text('SIGN OUT'),
+    );
+  }
+}
diff --git a/lib/common/cache_service.dart b/lib/common/cache_service.dart
new file mode 100644
index 0000000..dbaa257
--- /dev/null
+++ b/lib/common/cache_service.dart
@@ -0,0 +1,15 @@
+import 'cache_service_stub.dart'
+    if (dart.library.io) 'cache_service_io.dart'
+    if (dart.library.js_interop) 'cache_service_web.dart';
+
+abstract interface class CacheService {
+  factory CacheService() {
+    return createCacheService();
+  }
+
+  Future<void> clear();
+
+  Future<String?> get(String key);
+
+  Future<void> set(String key, String? value);
+}
diff --git a/lib/common/cache_service_io.dart b/lib/common/cache_service_io.dart
new file mode 100644
index 0000000..46ed70b
--- /dev/null
+++ b/lib/common/cache_service_io.dart
@@ -0,0 +1,69 @@
+import 'dart:io';
+
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+
+import 'cache_service.dart';
+
+CacheService createCacheService() {
+  return const CacheServiceIo();
+}
+
+class CacheServiceIo implements CacheService {
+  const CacheServiceIo();
+
+  @override
+  Future<void> clear() async {
+    final directory = await _getDirectory();
+
+    await for (final entity in directory.list()) {
+      if (entity is File) {
+        await entity.delete();
+      }
+    }
+  }
+
+  @override
+  Future<String?> get(String key) async {
+    final file = await _getFile(key);
+    if (!await file.exists()) {
+      return null;
+    }
+
+    final text = await file.readAsString();
+    if (text.isEmpty) {
+      return null;
+    }
+
+    return text;
+  }
+
+  @override
+  Future<void> set(String key, String? value) async {
+    final file = await _getFile(key);
+    if (!await file.exists()) {
+      await file.create();
+    }
+
+    if (value != null) {
+      await file.writeAsString(value);
+    } else {
+      await file.delete();
+    }
+  }
+
+  Future<Directory> _getDirectory() async {
+    final parent = await getApplicationCacheDirectory();
+    await parent.create();
+
+    final child = Directory(join(parent.path, 'cache'));
+    await child.create();
+
+    return child;
+  }
+
+  Future<File> _getFile(String key) async {
+    final directory = await _getDirectory();
+    return File(join(directory.path, key));
+  }
+}
diff --git a/lib/common/cache_service_stub.dart b/lib/common/cache_service_stub.dart
new file mode 100644
index 0000000..84dbef3
--- /dev/null
+++ b/lib/common/cache_service_stub.dart
@@ -0,0 +1,24 @@
+import 'cache_service.dart';
+
+CacheService createCacheService() {
+  return const CacheServiceStub();
+}
+
+class CacheServiceStub implements CacheService {
+  const CacheServiceStub();
+
+  @override
+  Future<void> clear() {
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<String?> get(String key) {
+    throw UnimplementedError();
+  }
+
+  @override
+  Future<void> set(String key, String? value) {
+    throw UnimplementedError();
+  }
+}
diff --git a/lib/common/cache_service_web.dart b/lib/common/cache_service_web.dart
new file mode 100644
index 0000000..a1e9cbc
--- /dev/null
+++ b/lib/common/cache_service_web.dart
@@ -0,0 +1,60 @@
+import 'dart:js_interop';
+
+import 'package:web/web.dart';
+
+import 'cache_service.dart';
+
+CacheService createCacheService() {
+  return const CacheServiceWeb();
+}
+
+class CacheServiceWeb implements CacheService {
+  const CacheServiceWeb();
+
+  @override
+  Future<void> clear() async {
+    await set('albums.json', null);
+  }
+
+  @override
+  Future<String?> get(String key) async {
+    final handle = await _getFileHandle(key);
+    final file = await handle.getFile().toDart;
+    final text = await file.text().toDart;
+    return text.toDart.isNotEmpty ? text.toDart : null;
+  }
+
+  @override
+  Future<void> set(String key, String? value) async {
+    final handle = await _getFileHandle(key);
+    final writable = await handle.createWritable().toDart;
+
+    try {
+      if (value != null) {
+        await writable.write(value.toJS).toDart;
+      } else {
+        await writable.truncate(0).toDart;
+      }
+    } finally {
+      await writable.close().toDart;
+    }
+  }
+
+  Future<FileSystemDirectoryHandle> _getDirectory() async {
+    final directory = await window.navigator.storage.getDirectory().toDart;
+    final options = FileSystemGetDirectoryOptions(create: true);
+    return await directory.getDirectoryHandle('cache', options).toDart;
+  }
+
+  Future<FileSystemDirectoryHandle> _getDirectoryHandle(String name) async {
+    final directory = await _getDirectory();
+    final options = FileSystemGetDirectoryOptions(create: true);
+    return await directory.getDirectoryHandle(name, options).toDart;
+  }
+
+  Future<FileSystemFileHandle> _getFileHandle(String name) async {
+    final directory = await _getDirectory();
+    final options = FileSystemGetFileOptions(create: true);
+    return await directory.getFileHandle(name, options).toDart;
+  }
+}
diff --git a/lib/common/open_in_google_photos_icon_button.dart b/lib/common/open_in_google_photos_icon_button.dart
new file mode 100644
index 0000000..ef6d426
--- /dev/null
+++ b/lib/common/open_in_google_photos_icon_button.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class OpenInGooglePhotosIconButton extends StatelessWidget {
+  const OpenInGooglePhotosIconButton({
+    super.key,
+    required this.productUrl,
+  });
+
+  final String productUrl;
+
+  @override
+  Widget build(BuildContext context) {
+    return IconButton(
+      onPressed: () async {
+        await launchUrl(
+          Uri.parse(productUrl),
+          webOnlyWindowName: '_blank',
+        );
+      },
+      tooltip: 'Open in Google Photos',
+      icon: const Icon(Icons.open_in_new),
+    );
+  }
+}
diff --git a/lib/common/paginator.dart b/lib/common/paginator.dart
new file mode 100644
index 0000000..09397d3
--- /dev/null
+++ b/lib/common/paginator.dart
@@ -0,0 +1,17 @@
+Stream<List<E>> paginator<E, T>(
+  Future<T> Function(String? pageToken) response,
+  String? Function(T response) nextPageToken,
+  List<E>? Function(T response) values,
+) async* {
+  String? pageToken_;
+
+  do {
+    final response_ = await response(pageToken_);
+
+    if (values(response_) case final values_?) {
+      yield values_;
+    }
+
+    pageToken_ = nextPageToken(response_);
+  } while (pageToken_ != null);
+}
diff --git a/lib/common/root_navigator_key.dart b/lib/common/root_navigator_key.dart
new file mode 100644
index 0000000..828ea9f
--- /dev/null
+++ b/lib/common/root_navigator_key.dart
@@ -0,0 +1,3 @@
+import 'package:flutter/widgets.dart';
+
+final rootNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'root');
diff --git a/lib/common/search_text_field.dart b/lib/common/search_text_field.dart
new file mode 100644
index 0000000..261a079
--- /dev/null
+++ b/lib/common/search_text_field.dart
@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart';
+
+class SearchTextField extends StatelessWidget {
+  const SearchTextField({
+    super.key,
+    this.onChanged,
+  });
+
+  final ValueChanged<String>? onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    return TextField(
+      decoration: const InputDecoration(
+        hintText: 'Search',
+        prefixIcon: Icon(Icons.search),
+      ),
+      autofocus: true,
+      onChanged: onChanged,
+    );
+  }
+}
diff --git a/lib/common/shell_navigator_key.dart b/lib/common/shell_navigator_key.dart
new file mode 100644
index 0000000..1d58cce
--- /dev/null
+++ b/lib/common/shell_navigator_key.dart
@@ -0,0 +1,3 @@
+import 'package:flutter/widgets.dart';
+
+final shellNavigatorKey = GlobalKey<NavigatorState>(debugLabel: 'shell');
diff --git a/lib/common/shell_scaffold.dart b/lib/common/shell_scaffold.dart
new file mode 100644
index 0000000..b8ef604
--- /dev/null
+++ b/lib/common/shell_scaffold.dart
@@ -0,0 +1,95 @@
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class ShellScaffold extends StatelessWidget {
+  const ShellScaffold({
+    super.key,
+    required this.child,
+  });
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    void onDestinationSelected(int index) {
+      switch (index) {
+        case 0:
+          context.go('/albums');
+          break;
+        case 1:
+          context.go('/settings');
+          break;
+      }
+    }
+
+    var selectedIndex = 0;
+
+    if (GoRouterState.of(context).fullPath case final path?) {
+      switch (path) {
+        case '/albums':
+        case '/albums/:albumId':
+          selectedIndex = 0;
+          break;
+        case '/settings':
+          selectedIndex = 1;
+          break;
+      }
+    }
+
+    return LayoutBuilder(
+      builder: (context, constraints) {
+        if (constraints.minWidth >= 1024) {
+          return Scaffold(
+            body: SafeArea(
+              child: Row(
+                children: [
+                  NavigationRail(
+                    extended: true,
+                    destinations: const [
+                      NavigationRailDestination(
+                        icon: Icon(Icons.photo_album),
+                        label: Text('Albums'),
+                      ),
+                      NavigationRailDestination(
+                        icon: Icon(Icons.settings),
+                        label: Text('Settings'),
+                      ),
+                    ],
+                    selectedIndex: selectedIndex,
+                    onDestinationSelected: onDestinationSelected,
+                  ),
+                  const VerticalDivider(
+                    width: 1,
+                  ),
+                  Expanded(
+                    child: child,
+                  ),
+                ],
+              ),
+            ),
+          );
+        } else {
+          return Scaffold(
+            body: SafeArea(
+              child: child,
+            ),
+            bottomNavigationBar: NavigationBar(
+              selectedIndex: selectedIndex,
+              destinations: const [
+                NavigationDestination(
+                  icon: Icon(Icons.photo_album),
+                  label: 'Albums',
+                ),
+                NavigationDestination(
+                  icon: Icon(Icons.settings),
+                  label: 'Settings',
+                ),
+              ],
+              onDestinationSelected: onDestinationSelected,
+            ),
+          );
+        }
+      },
+    );
+  }
+}
diff --git a/lib/sliver_persistent_header_delegates/sliver_search_bar_delegate.dart b/lib/common/sliver_search_bar_delegate.dart
similarity index 59%
rename from lib/sliver_persistent_header_delegates/sliver_search_bar_delegate.dart
rename to lib/common/sliver_search_bar_delegate.dart
index 000a9e3..cf0e6b5 100644
--- a/lib/sliver_persistent_header_delegates/sliver_search_bar_delegate.dart
+++ b/lib/common/sliver_search_bar_delegate.dart
@@ -1,25 +1,19 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 
 class SliverSearchBarDelegate extends SliverPersistentHeaderDelegate {
   SliverSearchBarDelegate({
-    this.minHeight = 86,
-    this.maxHeight = 86,
+    this.minExtent = 86,
+    this.maxExtent = 86,
     required this.child,
   });
 
-  final double minHeight;
-
-  final double maxHeight;
-
-  final Widget child;
-
   @override
-  double get minExtent => minHeight;
+  double minExtent;
 
   @override
-  double get maxExtent => max(maxHeight, minHeight);
+  double maxExtent;
+
+  final Widget child;
 
   @override
   Widget build(
@@ -29,15 +23,15 @@ class SliverSearchBarDelegate extends SliverPersistentHeaderDelegate {
   ) {
     return Padding(
       padding: const EdgeInsets.all(16),
-      child: Material(
-        elevation: 2,
-        borderRadius: BorderRadius.circular(4),
+      child: Card(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(32),
+        ),
         child: Theme(
           data: Theme.of(context).copyWith(
-            inputDecorationTheme: InputDecorationTheme(
+            inputDecorationTheme: const InputDecorationTheme(
               border: OutlineInputBorder(
                 borderSide: BorderSide.none,
-                borderRadius: BorderRadius.circular(4),
               ),
             ),
           ),
@@ -49,8 +43,8 @@ class SliverSearchBarDelegate extends SliverPersistentHeaderDelegate {
 
   @override
   bool shouldRebuild(SliverSearchBarDelegate oldDelegate) {
-    return maxHeight != oldDelegate.maxHeight ||
-        minHeight != oldDelegate.minHeight ||
+    return minExtent != oldDelegate.minExtent ||
+        maxExtent != oldDelegate.maxExtent ||
         child != oldDelegate.child;
   }
 }
diff --git a/lib/common/stream_notifier.dart b/lib/common/stream_notifier.dart
new file mode 100644
index 0000000..ed60cc5
--- /dev/null
+++ b/lib/common/stream_notifier.dart
@@ -0,0 +1,34 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+
+class StreamNotifier<T> extends ChangeNotifier implements ValueListenable<T> {
+  StreamNotifier({
+    required Stream<T> stream,
+    required T initialValue,
+  }) : _value = initialValue {
+    _subscription = stream.listen(
+      (value) {
+        if (_value != value) {
+          _value = value;
+          notifyListeners();
+        }
+      },
+    );
+  }
+
+  T _value;
+
+  StreamSubscription<T>? _subscription;
+
+  @override
+  T get value {
+    return _value;
+  }
+
+  @override
+  Future<void> dispose() async {
+    await _subscription?.cancel();
+    super.dispose();
+  }
+}
diff --git a/lib/extensions/string_extensions.dart b/lib/common/string_extensions.dart
similarity index 100%
rename from lib/extensions/string_extensions.dart
rename to lib/common/string_extensions.dart
diff --git a/lib/common/terms_of_service_text.dart b/lib/common/terms_of_service_text.dart
new file mode 100644
index 0000000..165fe93
--- /dev/null
+++ b/lib/common/terms_of_service_text.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class TermsOfServiceText extends StatelessWidget {
+  const TermsOfServiceText({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Text.rich(
+      TextSpan(
+        children: [
+          const TextSpan(
+            text:
+                'By continuing to Album Searcher for Google Photos you agree to the ',
+          ),
+          TextSpan(
+            text: 'Terms of Service',
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  color: Theme.of(context).colorScheme.primary,
+                ),
+            recognizer: TapGestureRecognizer()
+              ..onTap = () async {
+                await launchUrl(
+                  Uri.https(
+                    'googlephotosalbumsearcher.thomasclark.app',
+                    '/terms.html',
+                  ),
+                  webOnlyWindowName: '_blank',
+                );
+              },
+          ),
+          const TextSpan(
+            text: '.',
+          ),
+        ],
+      ),
+      textAlign: TextAlign.center,
+    );
+  }
+}
diff --git a/lib/common/welcome_card.dart b/lib/common/welcome_card.dart
new file mode 100644
index 0000000..f42708f
--- /dev/null
+++ b/lib/common/welcome_card.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+
+class WelcomeCard extends StatelessWidget {
+  const WelcomeCard({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.all(8),
+      child: Padding(
+        padding: const EdgeInsets.all(8),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(8),
+              child: Image.asset(
+                'images/image-search.png',
+                width: 48,
+                height: 48,
+                fit: BoxFit.contain,
+              ),
+            ),
+            Padding(
+              padding: const EdgeInsets.all(8),
+              child: Text(
+                'Welcome to Album Searcher for Google Photos',
+                style: Theme.of(context).textTheme.headlineMedium,
+                textAlign: TextAlign.center,
+              ),
+            ),
+            const Padding(
+              padding: EdgeInsets.all(8),
+              child: Text(
+                'Album Searcher for Google Photos gives you an enhanced search experience for albums.',
+                textAlign: TextAlign.center,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/enums/layout_mode.dart b/lib/enums/layout_mode.dart
deleted file mode 100644
index dc1373c..0000000
--- a/lib/enums/layout_mode.dart
+++ /dev/null
@@ -1,4 +0,0 @@
-enum LayoutMode {
-  grid,
-  list,
-}
diff --git a/lib/extensions/response_extensions.dart b/lib/extensions/response_extensions.dart
deleted file mode 100644
index bb62500..0000000
--- a/lib/extensions/response_extensions.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:http/http.dart';
-
-extension ResponseExtensions on Response {
-  bool get isSuccessStatusCode => statusCode >= 200 && statusCode < 300;
-}
diff --git a/lib/main.dart b/lib/main.dart
index d0e74ce..bd1449f 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,193 +1,199 @@
-import 'package:album_searcher_for_google_photos/route_information_parsers/app_route_information_parser.dart';
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-import 'package:album_searcher_for_google_photos/router_delegates/app_router_delegate.dart';
-import 'package:album_searcher_for_google_photos/services/album_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/media_item_service.dart';
-import 'package:album_searcher_for_google_photos/services/shared_album_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:google_sign_in_desktop/google_sign_in_desktop.dart';
+import 'package:google_sign_in_platform_interface/google_sign_in_platform_interface.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-Future<void> main() async {
-  WidgetsFlutterBinding.ensureInitialized();
+import 'albums/album_repository.dart';
+import 'albums/album_screen.dart';
+import 'albums/albums_screen.dart';
+import 'albums/caching_album_repository.dart';
+import 'authentication/google_sign_in_account_notifier.dart';
+import 'authentication/google_sign_in_desktop_token_data_store.dart';
+import 'authentication/sign_in_screen.dart';
+import 'authentication/authenticating_client.dart';
+import 'common/cache_service.dart';
+import 'common/root_navigator_key.dart';
+import 'common/shell_navigator_key.dart';
+import 'common/shell_scaffold.dart';
+import 'firebase_options.dart';
+import 'google_sign_in_parameters.dart';
+import 'media_items/media_item_repository.dart';
+import 'settings/settings_screen.dart';
+import 'settings/theme_notifier.dart';
 
-  if (kIsWeb) {
-    await Firebase.initializeApp();
-  }
+final _googleSignIn = GoogleSignIn(
+  clientId: GoogleSignInParameters.clientId,
+  scopes: GoogleSignInParameters.scopes,
+);
 
-  final storageService = StorageService();
+Future<void> main() async {
+  WidgetsFlutterBinding.ensureInitialized();
 
-  final authenticationStateData = AuthenticationStateData();
-  final layoutStateData = LayoutStateData(
-    layoutMode: await storageService.getLayoutMode(),
-  );
-  final routerStateData = RouterStateData();
-  final sharedAlbumStateData = SharedAlbumStateData(
-    sharedAlbums: await storageService.getSharedAlbums(),
-  );
-  final themeStateData = ThemeStateData(
-    themeMode: await storageService.getThemeMode(),
+  await Firebase.initializeApp(
+    options: DefaultFirebaseOptions.currentPlatform,
   );
 
-  final albumService = AlbumService(
-    authenticationStateData: authenticationStateData,
-  );
-  final authenticationService = AuthenticationService(
-    authenticationStateData: authenticationStateData,
-    layoutStateData: layoutStateData,
-    sharedAlbumStateData: sharedAlbumStateData,
-    storageService: storageService,
-    themeStateData: themeStateData,
-  );
-  final mediaItemService = MediaItemService(
-    authenticationStateData: authenticationStateData,
-  );
-  final sharedAlbumService = SharedAlbumService(
-    authenticationStateData: authenticationStateData,
-    sharedAlbumStateData: sharedAlbumStateData,
-    storageService: storageService,
-  );
+  if (GoogleSignInPlatform.instance case GoogleSignInDesktop instance) {
+    if (GoogleSignInParameters.clientSecret case final clientSecret?) {
+      instance.clientSecret = clientSecret;
+    }
 
-  try {
-    await authenticationService.signInSilent();
-  } catch (e) {
-    await authenticationService.signOut();
+    instance.tokenDataStore = const GoogleSignInDesktopTokenDataStore();
   }
 
   runApp(
-    App(
-      albumService: albumService,
-      authenticationService: authenticationService,
-      authenticationStateData: authenticationStateData,
-      layoutStateData: layoutStateData,
-      mediaItemService: mediaItemService,
-      routeInformationParser: AppRouteInformationParser(),
-      routerDelegate: AppRouterDelegate(
-        authenticationStateData: authenticationStateData,
-        routerStateData: routerStateData,
-      ),
-      routerStateData: routerStateData,
-      sharedAlbumService: sharedAlbumService,
-      sharedAlbumStateData: sharedAlbumStateData,
-      storageService: storageService,
-      themeStateData: themeStateData,
-    ),
-  );
-}
+    MultiProvider(
+      providers: [
+        Provider<CacheService>(
+          create: (context) {
+            return CacheService();
+          },
+        ),
+        Provider<GoogleSignIn>.value(
+          value: _googleSignIn,
+        ),
+        ChangeNotifierProvider<GoogleSignInAccountNotifier>(
+          create: (context) {
+            return GoogleSignInAccountNotifier(
+              googleSignIn: _googleSignIn,
+            );
+          },
+        ),
+        Provider<PhotosLibraryApi>(
+          create: (context) {
+            return PhotosLibraryApi(
+              AuthenticatingClient(
+                googleSignIn: _googleSignIn,
+              ),
+            );
+          },
+        ),
+        Provider<SharedPreferences>.value(
+          value: await SharedPreferences.getInstance(),
+        ),
+        ChangeNotifierProxyProvider<SharedPreferences, ThemeNotifier>(
+          create: (context) {
+            return ThemeNotifier();
+          },
+          update: (context, preferences, notifier) {
+            notifier ??= ThemeNotifier();
 
-class App extends StatefulWidget {
-  final AlbumService albumService;
-  final AuthenticationService authenticationService;
-  final AuthenticationStateData authenticationStateData;
-  final LayoutStateData layoutStateData;
-  final MediaItemService mediaItemService;
-  final RouteInformationParser<RoutePath> routeInformationParser;
-  final AppRouterDelegate routerDelegate;
-  final RouterStateData routerStateData;
-  final SharedAlbumService sharedAlbumService;
-  final SharedAlbumStateData sharedAlbumStateData;
-  final StorageService storageService;
-  final ThemeStateData themeStateData;
+            if (preferences.getInt('layout') case final index?) {
+              notifier.layoutMode = LayoutMode.values[index];
+            }
 
-  const App({
-    Key? key,
-    required this.albumService,
-    required this.authenticationService,
-    required this.authenticationStateData,
-    required this.layoutStateData,
-    required this.mediaItemService,
-    required this.routeInformationParser,
-    required this.routerDelegate,
-    required this.routerStateData,
-    required this.sharedAlbumService,
-    required this.sharedAlbumStateData,
-    required this.storageService,
-    required this.themeStateData,
-  }) : super(key: key);
+            if (preferences.getInt('theme') case final index?) {
+              notifier.themeMode = ThemeMode.values[index];
+            }
 
-  @override
-  _AppState createState() => _AppState();
+            return notifier;
+          },
+        ),
+        ProxyProvider2<CacheService, PhotosLibraryApi, AlbumRepository>(
+          update: (context, cacheService, photosLibraryApi, previous) {
+            return CachingAlbumRepository(
+              inner: AlbumRepository(
+                photosLibraryApi: photosLibraryApi,
+              ),
+              cacheService: cacheService,
+            );
+          },
+        ),
+        ProxyProvider<PhotosLibraryApi, MediaItemRepository>(
+          update: (context, photosLibraryApi, previous) {
+            return MediaItemRepository(
+              photosLibraryApi: photosLibraryApi,
+            );
+          },
+        ),
+      ],
+      child: const MyApp(),
+    ),
+  );
 }
 
-class _AppState extends State<App> {
+class MyApp extends StatelessWidget {
+  const MyApp({
+    super.key,
+  });
+
   @override
   Widget build(BuildContext context) {
-    return AlbumServiceScope(
-      service: widget.albumService,
-      child: AuthenticationServiceScope(
-        service: widget.authenticationService,
-        child: AuthenticationState(
-          notifier: widget.authenticationStateData,
-          child: LayoutState(
-            notifier: widget.layoutStateData,
-            child: MediaItemServiceScope(
-              service: widget.mediaItemService,
-              child: RouterState(
-                notifier: widget.routerStateData,
-                child: SharedAlbumServiceScope(
-                  service: widget.sharedAlbumService,
-                  child: SharedAlbumState(
-                    notifier: widget.sharedAlbumStateData,
-                    child: StorageServiceScope(
-                      service: widget.storageService,
-                      child: ThemeState(
-                        notifier: widget.themeStateData,
-                        child: Builder(
-                          builder: (context) => MaterialApp.router(
-                            routeInformationParser:
-                                widget.routeInformationParser,
-                            routerDelegate: widget.routerDelegate,
-                            title: 'Album Searcher for Google Photos',
-                            theme: ThemeData.from(
-                              colorScheme: ColorScheme.light(
-                                primary: Colors.red,
-                                primaryVariant: Colors.red[700]!,
-                                secondary: Colors.red,
-                                secondaryVariant: Colors.red[700]!,
-                                onPrimary: Colors.white,
-                                onSecondary: Colors.white,
-                              ),
-                            ),
-                            darkTheme: ThemeData.from(
-                              colorScheme: ColorScheme.dark(
-                                primary: Colors.red,
-                                primaryVariant: Colors.red[700]!,
-                                secondary: Colors.red,
-                                secondaryVariant: Colors.red[700]!,
-                                onPrimary: Colors.white,
-                                onSecondary: Colors.white,
-                              ),
-                            ),
-                            themeMode: ThemeState.of(context).themeMode,
-                          ),
-                        ),
-                      ),
-                    ),
+    return MaterialApp.router(
+      routerConfig: GoRouter(
+        routes: [
+          ShellRoute(
+            builder: (context, state, child) {
+              return ShellScaffold(
+                child: child,
+              );
+            },
+            routes: [
+              GoRoute(
+                path: '/albums',
+                builder: (context, state) {
+                  return const AlbumsScreen();
+                },
+                routes: [
+                  GoRoute(
+                    path: ':albumId',
+                    builder: (context, state) {
+                      return AlbumScreen(
+                        albumId: state.pathParameters['albumId']!,
+                      );
+                    },
                   ),
-                ),
+                ],
+              ),
+              GoRoute(
+                path: '/settings',
+                builder: (context, state) {
+                  return const SettingsScreen();
+                },
               ),
-            ),
+            ],
+            navigatorKey: shellNavigatorKey,
           ),
+          GoRoute(
+            path: '/signin',
+            builder: (context, state) {
+              return const SignInScreen();
+            },
+          ),
+        ],
+        redirect: (context, state) async {
+          if (context.read<GoogleSignInAccountNotifier>().value != null) {
+            return null;
+          }
+
+          return '/signin';
+        },
+        initialLocation: '/albums',
+        navigatorKey: rootNavigatorKey,
+      ),
+      title: 'Album Searcher for Google Photos',
+      theme: ThemeData(
+        colorScheme: ColorScheme.fromSeed(
+          seedColor: const Color(0xFFEA4335),
+          brightness: Brightness.light,
+        ),
+      ),
+      darkTheme: ThemeData(
+        colorScheme: ColorScheme.fromSeed(
+          seedColor: const Color(0xFFEA4335),
+          brightness: Brightness.dark,
         ),
       ),
+      themeMode: context.select<ThemeNotifier, ThemeMode>(
+        (notifier) {
+          return notifier.themeMode;
+        },
+      ),
     );
   }
-
-  @override
-  void dispose() {
-    widget.authenticationStateData.dispose();
-    widget.layoutStateData.dispose();
-    widget.routerDelegate.dispose();
-    widget.routerStateData.dispose();
-    widget.sharedAlbumStateData.dispose();
-    widget.themeStateData.dispose();
-    super.dispose();
-  }
 }
diff --git a/lib/media_items/media_item_card.dart b/lib/media_items/media_item_card.dart
new file mode 100644
index 0000000..9392696
--- /dev/null
+++ b/lib/media_items/media_item_card.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+
+class MediaItemCard extends StatelessWidget {
+  const MediaItemCard({
+    super.key,
+    required this.mediaItem,
+  });
+
+  final MediaItem mediaItem;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      elevation: 0,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.zero,
+      ),
+      clipBehavior: Clip.antiAlias,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          if (mediaItem.baseUrl case final baseUrl?)
+            Image.network(
+              '$baseUrl=w512-h512',
+              fit: BoxFit.cover,
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/widgets/media_item_list_tile.dart b/lib/media_items/media_item_list_tile.dart
similarity index 69%
rename from lib/widgets/media_item_list_tile.dart
rename to lib/media_items/media_item_list_tile.dart
index 89645c1..3311015 100644
--- a/lib/widgets/media_item_list_tile.dart
+++ b/lib/media_items/media_item_list_tile.dart
@@ -1,19 +1,19 @@
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
 import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
 
 class MediaItemListTile extends StatelessWidget {
-  final MediaItem mediaItem;
-
   const MediaItemListTile({
-    Key? key,
+    super.key,
     required this.mediaItem,
-  }) : super(key: key);
+  });
+
+  final MediaItem mediaItem;
 
   @override
   Widget build(BuildContext context) {
     return ListTile(
       title: Text(
-        mediaItem.filename ?? mediaItem.id,
+        mediaItem.filename ?? mediaItem.id ?? '',
         overflow: TextOverflow.ellipsis,
         maxLines: 1,
       ),
diff --git a/lib/media_items/media_item_repository.dart b/lib/media_items/media_item_repository.dart
new file mode 100644
index 0000000..c8acb70
--- /dev/null
+++ b/lib/media_items/media_item_repository.dart
@@ -0,0 +1,42 @@
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import '../common/paginator.dart';
+
+class MediaItemRepository {
+  final PhotosLibraryApi _photosLibraryApi;
+
+  const MediaItemRepository({
+    required PhotosLibraryApi photosLibraryApi,
+  }) : _photosLibraryApi = photosLibraryApi;
+
+  Future<MediaItem?> get(String mediaItemId) async {
+    try {
+      return await _photosLibraryApi.mediaItems.get(mediaItemId);
+    } catch (e) {
+      // ignored because null is returned when the media item is not found
+    }
+
+    return null;
+  }
+
+  Future<List<MediaItem>> search(String albumId) async {
+    return await paginator<MediaItem, SearchMediaItemsResponse>(
+      (pageToken) {
+        return _photosLibraryApi.mediaItems.search(
+          SearchMediaItemsRequest(
+            albumId: albumId,
+            pageToken: pageToken,
+          ),
+        );
+      },
+      (response) {
+        return response.nextPageToken;
+      },
+      (response) {
+        return response.mediaItems;
+      },
+    ).expand((albums) {
+      return albums;
+    }).toList();
+  }
+}
diff --git a/lib/media_items/media_item_sliver_grid.dart b/lib/media_items/media_item_sliver_grid.dart
new file mode 100644
index 0000000..0b79aef
--- /dev/null
+++ b/lib/media_items/media_item_sliver_grid.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import 'media_item_card.dart';
+
+class MediaItemSliverGrid extends StatelessWidget {
+  const MediaItemSliverGrid({
+    super.key,
+    required this.mediaItems,
+  });
+
+  final List<MediaItem> mediaItems;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverGrid.builder(
+      gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+        maxCrossAxisExtent: 500,
+      ),
+      itemBuilder: (context, index) {
+        return MediaItemCard(
+          key: ValueKey(mediaItems[index]),
+          mediaItem: mediaItems[index],
+        );
+      },
+      itemCount: mediaItems.length,
+    );
+  }
+}
diff --git a/lib/media_items/media_item_sliver_list.dart b/lib/media_items/media_item_sliver_list.dart
new file mode 100644
index 0000000..5a35331
--- /dev/null
+++ b/lib/media_items/media_item_sliver_list.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:googleapis/photoslibrary/v1.dart';
+
+import 'media_item_list_tile.dart';
+
+class MediaItemSliverList extends StatelessWidget {
+  const MediaItemSliverList({
+    super.key,
+    required this.mediaItems,
+  });
+
+  final List<MediaItem> mediaItems;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverList.builder(
+      itemBuilder: (context, index) {
+        return MediaItemListTile(
+          key: ValueKey(mediaItems[index]),
+          mediaItem: mediaItems[index],
+        );
+      },
+      itemCount: mediaItems.length,
+    );
+  }
+}
diff --git a/lib/models/album.dart b/lib/models/album.dart
deleted file mode 100644
index 9cec640..0000000
--- a/lib/models/album.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/share_info.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-part 'album.g.dart';
-
-@JsonSerializable()
-class Album implements Comparable<Album> {
-  String id;
-  String? title;
-  String? productUrl;
-  bool? isWriteable;
-  ShareInfo? shareInfo;
-  String? mediaItemsCount;
-  String? coverPhotoBaseUrl;
-  String? coverPhotoMediaItemId;
-
-  Album({
-    required this.id,
-    this.title,
-    this.productUrl,
-    this.isWriteable,
-    this.shareInfo,
-    this.mediaItemsCount,
-    this.coverPhotoBaseUrl,
-    this.coverPhotoMediaItemId,
-  });
-
-  factory Album.fromJson(Map<String, dynamic> json) => _$AlbumFromJson(json);
-
-  Map<String, dynamic> toJson() => _$AlbumToJson(this);
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is Album && runtimeType == other.runtimeType && id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-
-  @override
-  int compareTo(Album other) => (title ?? '').compareTo(other.title ?? '');
-
-  @override
-  String toString() => title ?? super.toString();
-}
diff --git a/lib/models/album.g.dart b/lib/models/album.g.dart
deleted file mode 100644
index 6b68ce9..0000000
--- a/lib/models/album.g.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'album.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-Album _$AlbumFromJson(Map<String, dynamic> json) {
-  return Album(
-    id: json['id'] as String,
-    title: json['title'] as String?,
-    productUrl: json['productUrl'] as String?,
-    isWriteable: json['isWriteable'] as bool?,
-    shareInfo: json['shareInfo'] == null
-        ? null
-        : ShareInfo.fromJson(json['shareInfo'] as Map<String, dynamic>),
-    mediaItemsCount: json['mediaItemsCount'] as String?,
-    coverPhotoBaseUrl: json['coverPhotoBaseUrl'] as String?,
-    coverPhotoMediaItemId: json['coverPhotoMediaItemId'] as String?,
-  );
-}
-
-Map<String, dynamic> _$AlbumToJson(Album instance) => <String, dynamic>{
-      'id': instance.id,
-      'title': instance.title,
-      'productUrl': instance.productUrl,
-      'isWriteable': instance.isWriteable,
-      'shareInfo': instance.shareInfo,
-      'mediaItemsCount': instance.mediaItemsCount,
-      'coverPhotoBaseUrl': instance.coverPhotoBaseUrl,
-      'coverPhotoMediaItemId': instance.coverPhotoMediaItemId,
-    };
diff --git a/lib/models/contributor_info.dart b/lib/models/contributor_info.dart
deleted file mode 100644
index 766938b..0000000
--- a/lib/models/contributor_info.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'contributor_info.g.dart';
-
-@JsonSerializable()
-class ContributorInfo {
-  String? profilePictureBaseUrl;
-  String? displayName;
-
-  ContributorInfo({
-    this.profilePictureBaseUrl,
-    this.displayName,
-  });
-
-  factory ContributorInfo.fromJson(Map<String, dynamic> json) =>
-      _$ContributorInfoFromJson(json);
-
-  Map<String, dynamic> toJson() => _$ContributorInfoToJson(this);
-}
diff --git a/lib/models/contributor_info.g.dart b/lib/models/contributor_info.g.dart
deleted file mode 100644
index 6d7bb10..0000000
--- a/lib/models/contributor_info.g.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'contributor_info.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ContributorInfo _$ContributorInfoFromJson(Map<String, dynamic> json) {
-  return ContributorInfo(
-    profilePictureBaseUrl: json['profilePictureBaseUrl'] as String?,
-    displayName: json['displayName'] as String?,
-  );
-}
-
-Map<String, dynamic> _$ContributorInfoToJson(ContributorInfo instance) =>
-    <String, dynamic>{
-      'profilePictureBaseUrl': instance.profilePictureBaseUrl,
-      'displayName': instance.displayName,
-    };
diff --git a/lib/models/media_item.dart b/lib/models/media_item.dart
deleted file mode 100644
index a0d5dda..0000000
--- a/lib/models/media_item.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/contributor_info.dart';
-import 'package:album_searcher_for_google_photos/models/media_metadata.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-part 'media_item.g.dart';
-
-@JsonSerializable()
-class MediaItem implements Comparable<MediaItem> {
-  String id;
-  String? description;
-  String? productUrl;
-  String? baseUrl;
-  String? mimeType;
-  MediaMetadata? mediaMetadata;
-  ContributorInfo? contributorInfo;
-  String? filename;
-
-  MediaItem({
-    required this.id,
-    this.description,
-    this.productUrl,
-    this.baseUrl,
-    this.mimeType,
-    this.mediaMetadata,
-    this.contributorInfo,
-    this.filename,
-  });
-
-  factory MediaItem.fromJson(Map<String, dynamic> json) =>
-      _$MediaItemFromJson(json);
-
-  Map<String, dynamic> toJson() => _$MediaItemToJson(this);
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is MediaItem && runtimeType == other.runtimeType && id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-
-  @override
-  int compareTo(MediaItem other) =>
-      (filename ?? '').compareTo(other.filename ?? '');
-
-  @override
-  String toString() => filename ?? super.toString();
-}
diff --git a/lib/models/media_item.g.dart b/lib/models/media_item.g.dart
deleted file mode 100644
index 49b4243..0000000
--- a/lib/models/media_item.g.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'media_item.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-MediaItem _$MediaItemFromJson(Map<String, dynamic> json) {
-  return MediaItem(
-    id: json['id'] as String,
-    description: json['description'] as String?,
-    productUrl: json['productUrl'] as String?,
-    baseUrl: json['baseUrl'] as String?,
-    mimeType: json['mimeType'] as String?,
-    mediaMetadata: json['mediaMetadata'] == null
-        ? null
-        : MediaMetadata.fromJson(json['mediaMetadata'] as Map<String, dynamic>),
-    contributorInfo: json['contributorInfo'] == null
-        ? null
-        : ContributorInfo.fromJson(
-            json['contributorInfo'] as Map<String, dynamic>),
-    filename: json['filename'] as String?,
-  );
-}
-
-Map<String, dynamic> _$MediaItemToJson(MediaItem instance) => <String, dynamic>{
-      'id': instance.id,
-      'description': instance.description,
-      'productUrl': instance.productUrl,
-      'baseUrl': instance.baseUrl,
-      'mimeType': instance.mimeType,
-      'mediaMetadata': instance.mediaMetadata,
-      'contributorInfo': instance.contributorInfo,
-      'filename': instance.filename,
-    };
diff --git a/lib/models/media_metadata.dart b/lib/models/media_metadata.dart
deleted file mode 100644
index 2a58275..0000000
--- a/lib/models/media_metadata.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'media_metadata.g.dart';
-
-@JsonSerializable()
-class MediaMetadata {
-  String? creationTime;
-  String? width;
-  String? height;
-
-  MediaMetadata({
-    this.creationTime,
-    this.width,
-    this.height,
-  });
-
-  factory MediaMetadata.fromJson(Map<String, dynamic> json) =>
-      _$MediaMetadataFromJson(json);
-
-  Map<String, dynamic> toJson() => _$MediaMetadataToJson(this);
-}
diff --git a/lib/models/media_metadata.g.dart b/lib/models/media_metadata.g.dart
deleted file mode 100644
index 5837471..0000000
--- a/lib/models/media_metadata.g.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'media_metadata.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-MediaMetadata _$MediaMetadataFromJson(Map<String, dynamic> json) {
-  return MediaMetadata(
-    creationTime: json['creationTime'] as String?,
-    width: json['width'] as String?,
-    height: json['height'] as String?,
-  );
-}
-
-Map<String, dynamic> _$MediaMetadataToJson(MediaMetadata instance) =>
-    <String, dynamic>{
-      'creationTime': instance.creationTime,
-      'width': instance.width,
-      'height': instance.height,
-    };
diff --git a/lib/models/share_info.dart b/lib/models/share_info.dart
deleted file mode 100644
index 5a8cffd..0000000
--- a/lib/models/share_info.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/shared_album_options.dart';
-import 'package:json_annotation/json_annotation.dart';
-
-part 'share_info.g.dart';
-
-@JsonSerializable()
-class ShareInfo {
-  SharedAlbumOptions? sharedAlbumOptions;
-  String? shareableUrl;
-  String? shareToken;
-  bool? isJoined;
-  bool? isOwned;
-  bool? isJoinable;
-
-  ShareInfo({
-    this.sharedAlbumOptions,
-    this.shareableUrl,
-    this.shareToken,
-    this.isJoined,
-    this.isOwned,
-    this.isJoinable,
-  });
-
-  factory ShareInfo.fromJson(Map<String, dynamic> json) =>
-      _$ShareInfoFromJson(json);
-
-  Map<String, dynamic> toJson() => _$ShareInfoToJson(this);
-}
diff --git a/lib/models/share_info.g.dart b/lib/models/share_info.g.dart
deleted file mode 100644
index 399fb30..0000000
--- a/lib/models/share_info.g.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'share_info.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ShareInfo _$ShareInfoFromJson(Map<String, dynamic> json) {
-  return ShareInfo(
-    sharedAlbumOptions: json['sharedAlbumOptions'] == null
-        ? null
-        : SharedAlbumOptions.fromJson(
-            json['sharedAlbumOptions'] as Map<String, dynamic>),
-    shareableUrl: json['shareableUrl'] as String?,
-    shareToken: json['shareToken'] as String?,
-    isJoined: json['isJoined'] as bool?,
-    isOwned: json['isOwned'] as bool?,
-    isJoinable: json['isJoinable'] as bool?,
-  );
-}
-
-Map<String, dynamic> _$ShareInfoToJson(ShareInfo instance) => <String, dynamic>{
-      'sharedAlbumOptions': instance.sharedAlbumOptions,
-      'shareableUrl': instance.shareableUrl,
-      'shareToken': instance.shareToken,
-      'isJoined': instance.isJoined,
-      'isOwned': instance.isOwned,
-      'isJoinable': instance.isJoinable,
-    };
diff --git a/lib/models/shared_album_options.dart b/lib/models/shared_album_options.dart
deleted file mode 100644
index e225aa0..0000000
--- a/lib/models/shared_album_options.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'shared_album_options.g.dart';
-
-@JsonSerializable()
-class SharedAlbumOptions {
-  bool? isCollaborative;
-  bool? isCommentable;
-
-  SharedAlbumOptions({
-    this.isCollaborative,
-    this.isCommentable,
-  });
-
-  factory SharedAlbumOptions.fromJson(Map<String, dynamic> json) =>
-      _$SharedAlbumOptionsFromJson(json);
-
-  Map<String, dynamic> toJson() => _$SharedAlbumOptionsToJson(this);
-}
diff --git a/lib/models/shared_album_options.g.dart b/lib/models/shared_album_options.g.dart
deleted file mode 100644
index 83efbc4..0000000
--- a/lib/models/shared_album_options.g.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'shared_album_options.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-SharedAlbumOptions _$SharedAlbumOptionsFromJson(Map<String, dynamic> json) {
-  return SharedAlbumOptions(
-    isCollaborative: json['isCollaborative'] as bool?,
-    isCommentable: json['isCommentable'] as bool?,
-  );
-}
-
-Map<String, dynamic> _$SharedAlbumOptionsToJson(SharedAlbumOptions instance) =>
-    <String, dynamic>{
-      'isCollaborative': instance.isCollaborative,
-      'isCommentable': instance.isCommentable,
-    };
diff --git a/lib/pages/album_page.dart b/lib/pages/album_page.dart
deleted file mode 100644
index 4fd5cf2..0000000
--- a/lib/pages/album_page.dart
+++ /dev/null
@@ -1,91 +0,0 @@
-import 'package:album_searcher_for_google_photos/enums/layout_mode.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/services/album_service.dart';
-import 'package:album_searcher_for_google_photos/services/media_item_service.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/widgets/album_sliver_app_bar.dart';
-import 'package:album_searcher_for_google_photos/widgets/media_items_sliver_grid.dart';
-import 'package:album_searcher_for_google_photos/widgets/media_items_sliver_list.dart';
-import 'package:flutter/material.dart';
-
-class AlbumPage extends StatefulWidget {
-  final String id;
-
-  const AlbumPage({
-    Key? key,
-    required this.id,
-  }) : super(key: key);
-
-  @override
-  _AlbumPageState createState() => _AlbumPageState();
-}
-
-class _AlbumPageState extends State<AlbumPage> {
-  late Future<Album> _albumFuture;
-  late Future<List<MediaItem>> _mediaItemsFuture;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SafeArea(
-        child: FutureBuilder<Album>(
-          future: _albumFuture,
-          builder: (context, snapshot) {
-            if (snapshot.hasData) {
-              final albumSliverAppBar = AlbumSliverAppBar(
-                album: snapshot.data!,
-              );
-
-              return FutureBuilder<List<MediaItem>>(
-                future: _mediaItemsFuture,
-                builder: (context, snapshot) {
-                  Widget mediaItemsSliver;
-                  if (snapshot.hasData) {
-                    switch (LayoutState.of(context).layoutMode) {
-                      case LayoutMode.grid:
-                        mediaItemsSliver = SliverPadding(
-                          padding: const EdgeInsets.all(8),
-                          sliver: MediaItemsSliverGrid(
-                            mediaItems: snapshot.data!.toList()..sort(),
-                          ),
-                        );
-                        break;
-                      case LayoutMode.list:
-                        mediaItemsSliver = MediaItemsSliverList(
-                          mediaItems: snapshot.data!.toList()..sort(),
-                        );
-                        break;
-                    }
-                  } else {
-                    mediaItemsSliver = SliverToBoxAdapter(
-                      child: LinearProgressIndicator(),
-                    );
-                  }
-
-                  return CustomScrollView(
-                    slivers: [
-                      albumSliverAppBar,
-                      mediaItemsSliver,
-                    ],
-                  );
-                },
-              );
-            } else {
-              return Center(
-                child: CircularProgressIndicator(),
-              );
-            }
-          },
-        ),
-      ),
-    );
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _albumFuture = AlbumServiceScope.of(context).get(widget.id);
-    _mediaItemsFuture = MediaItemServiceScope.of(context).search(widget.id);
-  }
-}
diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
deleted file mode 100644
index 031650d..0000000
--- a/lib/pages/home_page.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'package:album_searcher_for_google_photos/enums/layout_mode.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/services/shared_album_service.dart';
-import 'package:album_searcher_for_google_photos/sliver_persistent_header_delegates/sliver_search_bar_delegate.dart';
-import 'package:album_searcher_for_google_photos/specifications/album_title_specification.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/widgets/albums_sliver_grid.dart';
-import 'package:album_searcher_for_google_photos/widgets/albums_sliver_list.dart';
-import 'package:flutter/material.dart';
-
-class HomePage extends StatefulWidget {
-  const HomePage({Key? key}) : super(key: key);
-
-  @override
-  _HomePageState createState() => _HomePageState();
-}
-
-class _HomePageState extends State<HomePage> {
-  String? _query;
-
-  @override
-  Widget build(BuildContext context) {
-    final sharedAlbums = SharedAlbumState.of(context).sharedAlbums?.toList();
-    if (sharedAlbums != null) {
-      final query = _query;
-      if (query != null && query.isNotEmpty) {
-        final specification = AlbumTitleSpecification(title: query);
-        sharedAlbums.retainWhere(specification.isSatisfiedBy);
-      }
-
-      Widget albumsSliver;
-      switch (LayoutState.of(context).layoutMode) {
-        case LayoutMode.grid:
-          albumsSliver = SliverPadding(
-            padding: const EdgeInsets.all(8),
-            sliver: AlbumsSliverGrid(
-              albums: sharedAlbums..sort(),
-            ),
-          );
-          break;
-        case LayoutMode.list:
-          albumsSliver = AlbumsSliverList(
-            albums: sharedAlbums..sort(),
-          );
-          break;
-      }
-
-      return RefreshIndicator(
-        child: CustomScrollView(
-          slivers: [
-            SliverPersistentHeader(
-              delegate: SliverSearchBarDelegate(
-                child: Row(
-                  children: [
-                    Expanded(
-                      child: TextField(
-                        decoration: InputDecoration(
-                          hintText: 'Search',
-                          prefixIcon: Icon(Icons.search),
-                        ),
-                        autofocus: true,
-                        onChanged: (value) {
-                          setState(() {
-                            _query = value;
-                          });
-                        },
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-              floating: true,
-            ),
-            albumsSliver,
-          ],
-        ),
-        onRefresh: () async {
-          try {
-            await SharedAlbumServiceScope.of(context).list();
-          } catch (e) {
-            await showDialog<void>(
-              context: context,
-              builder: (context) => AlertDialog(
-                title: Text('Error'),
-                content: Text(e.toString()),
-                actions: [
-                  TextButton(
-                    onPressed: () => Navigator.of(context).pop(),
-                    child: Text('OK'),
-                  ),
-                ],
-              ),
-            );
-          }
-        },
-      );
-    } else {
-      return FutureBuilder<List<Album>>(
-        future: SharedAlbumServiceScope.of(context).list(),
-        builder: (context, snapshot) => Center(
-          child: CircularProgressIndicator(),
-        ),
-      );
-    }
-  }
-}
diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart
deleted file mode 100644
index 8aeb51c..0000000
--- a/lib/pages/main_page.dart
+++ /dev/null
@@ -1,116 +0,0 @@
-import 'package:album_searcher_for_google_photos/router_delegates/main_router_delegate.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
-import 'package:flutter/material.dart';
-
-class MainPage extends StatefulWidget {
-  final RouterStateData routerStateData;
-
-  const MainPage({
-    Key? key,
-    required this.routerStateData,
-  }) : super(key: key);
-
-  @override
-  _MainPageState createState() => _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> {
-  late ChildBackButtonDispatcher _backButtonDispatcher;
-  late MainRouterDelegate _routerDelegate;
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(
-      builder: (context, constraints) {
-        Widget body = Router(
-          routerDelegate: _routerDelegate,
-          backButtonDispatcher: _backButtonDispatcher..takePriority(),
-        );
-
-        Widget? bottomNavigationBar;
-
-        if (constraints.maxWidth >= 768) {
-          body = Row(
-            children: [
-              NavigationRail(
-                extended: constraints.maxWidth >= 1024,
-                destinations: [
-                  NavigationRailDestination(
-                    icon: Icon(Icons.home_outlined),
-                    selectedIcon: Icon(Icons.home),
-                    label: Text('Home'),
-                  ),
-                  NavigationRailDestination(
-                    icon: Icon(Icons.settings_outlined),
-                    selectedIcon: Icon(Icons.settings),
-                    label: Text('Settings'),
-                  ),
-                ],
-                selectedIndex: RouterState.of(context).selectedIndex,
-                onDestinationSelected: (value) {
-                  RouterState.of(context).selectedIndex = value;
-                },
-              ),
-              VerticalDivider(
-                width: 1,
-                thickness: 1,
-              ),
-              Expanded(
-                child: body,
-              ),
-            ],
-          );
-        } else {
-          bottomNavigationBar = BottomNavigationBar(
-            items: [
-              BottomNavigationBarItem(
-                icon: Icon(Icons.home_outlined),
-                label: 'Home',
-                activeIcon: Icon(Icons.home),
-              ),
-              BottomNavigationBarItem(
-                icon: Icon(Icons.settings_outlined),
-                label: 'Settings',
-                activeIcon: Icon(Icons.settings),
-              ),
-            ],
-            onTap: (value) {
-              RouterState.of(context).selectedIndex = value;
-            },
-            currentIndex: RouterState.of(context).selectedIndex,
-            type: BottomNavigationBarType.fixed,
-          );
-        }
-
-        return Scaffold(
-          body: SafeArea(
-            child: body,
-          ),
-          bottomNavigationBar: bottomNavigationBar,
-        );
-      },
-    );
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _backButtonDispatcher = Router.of(context)
-        .backButtonDispatcher!
-        .createChildBackButtonDispatcher();
-  }
-
-  @override
-  void didUpdateWidget(covariant MainPage oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    _routerDelegate.routerStateData = widget.routerStateData;
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _routerDelegate = MainRouterDelegate(
-      routerStateData: widget.routerStateData,
-    );
-  }
-}
diff --git a/lib/pages/settings_page.dart b/lib/pages/settings_page.dart
deleted file mode 100644
index bd00cb3..0000000
--- a/lib/pages/settings_page.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'package:album_searcher_for_google_photos/widgets/layout_dropdown_form_field.dart';
-import 'package:album_searcher_for_google_photos/widgets/sign_out_floating_action_button.dart';
-import 'package:album_searcher_for_google_photos/widgets/theme_dropdown_form_field.dart';
-import 'package:flutter/material.dart';
-
-class SettingsPage extends StatelessWidget {
-  const SettingsPage({
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        ListView(
-          padding: const EdgeInsets.all(8),
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(8),
-              child: LayoutDropdownButtonFormField(),
-            ),
-            Padding(
-              padding: const EdgeInsets.all(8),
-              child: ThemeDropdownButtonFormField(),
-            ),
-          ],
-        ),
-        Positioned(
-          right: 16,
-          bottom: 16,
-          child: SignOutFloatingActionButton(),
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/pages/welcome_page.dart b/lib/pages/welcome_page.dart
deleted file mode 100644
index bb40fd2..0000000
--- a/lib/pages/welcome_page.dart
+++ /dev/null
@@ -1,155 +0,0 @@
-import 'package:album_searcher_for_google_photos/widgets/sign_in_elevated_button.dart';
-import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class WelcomePage extends StatefulWidget {
-  const WelcomePage({Key? key}) : super(key: key);
-
-  @override
-  _WelcomePageState createState() => _WelcomePageState();
-}
-
-class _WelcomePageState extends State<WelcomePage> {
-  late TapGestureRecognizer _tapGestureRecognizer;
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SafeArea(
-        child: Center(
-          child: ConstrainedBox(
-            constraints: BoxConstraints(
-              maxWidth: 800,
-            ),
-            child: Padding(
-              padding: const EdgeInsets.all(8),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  Card(
-                    margin: const EdgeInsets.all(8),
-                    child: Padding(
-                      padding: const EdgeInsets.all(8),
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: CircleAvatar(
-                              child: SvgPicture.asset(
-                                'images/image-search.svg',
-                                width: 50,
-                                height: 50,
-                                color: Theme.of(context).colorScheme.onPrimary,
-                              ),
-                              backgroundColor:
-                                  Theme.of(context).colorScheme.primary,
-                              radius: 40,
-                            ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: Text(
-                              'Welcome to Album Searcher for Google Photos',
-                              style: Theme.of(context).textTheme.headline6,
-                              textAlign: TextAlign.center,
-                            ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: Text(
-                              'Album Searcher for Google Photos gives you an enhanced search experience for shared albums.',
-                              textAlign: TextAlign.center,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  Card(
-                    margin: const EdgeInsets.all(8),
-                    child: Padding(
-                      padding: const EdgeInsets.all(8),
-                      child: Column(
-                        mainAxisSize: MainAxisSize.min,
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        children: [
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: Text(
-                              'Sign in with Google to continue to Album Searcher for Google Photos.',
-                              textAlign: TextAlign.center,
-                            ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: Text(
-                              'Album Searcher for Google Photos will have read access to your photos library.',
-                              textAlign: TextAlign.center,
-                            ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: Text.rich(
-                              TextSpan(
-                                children: [
-                                  TextSpan(
-                                    text:
-                                        'By continuing to Album Searcher for Google Photos you agree to the ',
-                                  ),
-                                  TextSpan(
-                                    text: 'Terms of Service',
-                                    style: Theme.of(context)
-                                        .textTheme
-                                        .bodyText2!
-                                        .copyWith(
-                                          color: Theme.of(context)
-                                              .colorScheme
-                                              .primary,
-                                        ),
-                                    recognizer: _tapGestureRecognizer,
-                                  ),
-                                  TextSpan(
-                                    text: '.',
-                                  ),
-                                ],
-                              ),
-                              textAlign: TextAlign.center,
-                            ),
-                          ),
-                          Padding(
-                            padding: const EdgeInsets.all(8),
-                            child: SignInElevatedButton(),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  @override
-  void dispose() {
-    _tapGestureRecognizer.dispose();
-    super.dispose();
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _tapGestureRecognizer = TapGestureRecognizer()
-      ..onTap = () async => await launch(
-            'https://albumsearcherforgooglephotos.thomasclark.app/terms.html',
-          );
-  }
-}
diff --git a/lib/route_information_parsers/app_route_information_parser.dart b/lib/route_information_parsers/app_route_information_parser.dart
deleted file mode 100644
index a14d855..0000000
--- a/lib/route_information_parsers/app_route_information_parser.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:album_searcher_for_google_photos/route_paths/album_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/home_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/settings_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/welcome_route_path.dart';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/widgets.dart';
-
-class AppRouteInformationParser extends RouteInformationParser<RoutePath> {
-  @override
-  Future<RoutePath> parseRouteInformation(
-    RouteInformation routeInformation,
-  ) async {
-    final uri = Uri.parse(routeInformation.location!);
-
-    switch (uri.pathSegments.length) {
-      case 1:
-        switch (uri.pathSegments[0]) {
-          case 'welcome':
-            return SynchronousFuture(WelcomeRoutePath());
-          case 'settings':
-            return SynchronousFuture(SettingsRoutePath());
-        }
-        break;
-      case 2:
-        switch (uri.pathSegments[0]) {
-          case 'albums':
-            final id = uri.pathSegments[1];
-            return SynchronousFuture(AlbumRoutePath(id: id));
-        }
-        break;
-    }
-
-    return SynchronousFuture(HomeRoutePath());
-  }
-
-  @override
-  RouteInformation? restoreRouteInformation(
-    RoutePath configuration,
-  ) {
-    if (configuration is HomeRoutePath) {
-      return RouteInformation(
-        location: '/',
-      );
-    } else if (configuration is AlbumRoutePath) {
-      return RouteInformation(
-        location: '/albums/${configuration.id}',
-      );
-    } else if (configuration is WelcomeRoutePath) {
-      return RouteInformation(
-        location: '/welcome',
-      );
-    } else if (configuration is SettingsRoutePath) {
-      return RouteInformation(
-        location: '/settings',
-      );
-    }
-
-    return null;
-  }
-}
diff --git a/lib/route_paths/album_route_path.dart b/lib/route_paths/album_route_path.dart
deleted file mode 100644
index 6462db0..0000000
--- a/lib/route_paths/album_route_path.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-
-class AlbumRoutePath extends RoutePath {
-  final String id;
-
-  const AlbumRoutePath({
-    required this.id,
-  });
-}
diff --git a/lib/route_paths/home_route_path.dart b/lib/route_paths/home_route_path.dart
deleted file mode 100644
index cdd221c..0000000
--- a/lib/route_paths/home_route_path.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-
-class HomeRoutePath extends RoutePath {
-  const HomeRoutePath();
-}
diff --git a/lib/route_paths/route_path.dart b/lib/route_paths/route_path.dart
deleted file mode 100644
index bf14b1f..0000000
--- a/lib/route_paths/route_path.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-abstract class RoutePath {
-  const RoutePath();
-}
diff --git a/lib/route_paths/settings_route_path.dart b/lib/route_paths/settings_route_path.dart
deleted file mode 100644
index 1071ee2..0000000
--- a/lib/route_paths/settings_route_path.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-
-class SettingsRoutePath extends RoutePath {
-  const SettingsRoutePath();
-}
diff --git a/lib/route_paths/welcome_route_path.dart b/lib/route_paths/welcome_route_path.dart
deleted file mode 100644
index 5f05945..0000000
--- a/lib/route_paths/welcome_route_path.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-
-class WelcomeRoutePath extends RoutePath {
-  const WelcomeRoutePath();
-}
diff --git a/lib/router_delegates/app_router_delegate.dart b/lib/router_delegates/app_router_delegate.dart
deleted file mode 100644
index 3817aad..0000000
--- a/lib/router_delegates/app_router_delegate.dart
+++ /dev/null
@@ -1,102 +0,0 @@
-import 'package:album_searcher_for_google_photos/pages/album_page.dart';
-import 'package:album_searcher_for_google_photos/pages/main_page.dart';
-import 'package:album_searcher_for_google_photos/pages/welcome_page.dart';
-import 'package:album_searcher_for_google_photos/route_paths/album_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/home_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/settings_route_path.dart';
-import 'package:album_searcher_for_google_photos/route_paths/welcome_route_path.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
-import 'package:flutter/material.dart';
-
-class AppRouterDelegate extends RouterDelegate<RoutePath>
-    with ChangeNotifier, PopNavigatorRouterDelegateMixin<RoutePath> {
-  @override
-  final navigatorKey = GlobalKey<NavigatorState>();
-
-  final AuthenticationStateData authenticationStateData;
-  final RouterStateData routerStateData;
-
-  AppRouterDelegate({
-    required this.authenticationStateData,
-    required this.routerStateData,
-  }) {
-    authenticationStateData.addListener(notifyListeners);
-    routerStateData.addListener(notifyListeners);
-  }
-
-  @override
-  RoutePath? get currentConfiguration {
-    if (authenticationStateData.client == null) {
-      return WelcomeRoutePath();
-    }
-
-    final selectedAlbum = routerStateData.selectedAlbum;
-    if (selectedAlbum != null) {
-      return AlbumRoutePath(id: selectedAlbum);
-    }
-
-    switch (routerStateData.selectedIndex) {
-      case 0:
-        return HomeRoutePath();
-      case 1:
-        return SettingsRoutePath();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Navigator(
-      key: navigatorKey,
-      pages: [
-        if (authenticationStateData.client != null) ...[
-          MaterialPage<void>(
-            child: MainPage(
-              routerStateData: routerStateData,
-            ),
-            key: ValueKey('main_page'),
-          ),
-          if (routerStateData.selectedAlbum != null)
-            MaterialPage<void>(
-              child: AlbumPage(
-                id: routerStateData.selectedAlbum!,
-              ),
-              key: ValueKey('album_page'),
-            ),
-        ] else
-          const MaterialPage<void>(
-            child: WelcomePage(),
-            key: ValueKey('welcome_page'),
-          ),
-      ],
-      onPopPage: (route, result) {
-        if (!route.didPop(result)) {
-          return false;
-        }
-
-        routerStateData.selectedAlbum = null;
-
-        return true;
-      },
-    );
-  }
-
-  @override
-  void dispose() {
-    authenticationStateData.removeListener(notifyListeners);
-    routerStateData.removeListener(notifyListeners);
-    super.dispose();
-  }
-
-  @override
-  Future<void> setNewRoutePath(RoutePath configuration) async {
-    if (configuration is HomeRoutePath) {
-      routerStateData.selectedIndex = 0;
-    } else if (configuration is AlbumRoutePath) {
-      routerStateData.selectedAlbum = configuration.id;
-    } else if (configuration is SettingsRoutePath) {
-      routerStateData.selectedIndex = 1;
-    }
-  }
-}
diff --git a/lib/router_delegates/main_router_delegate.dart b/lib/router_delegates/main_router_delegate.dart
deleted file mode 100644
index e2a94da..0000000
--- a/lib/router_delegates/main_router_delegate.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:album_searcher_for_google_photos/pages/home_page.dart';
-import 'package:album_searcher_for_google_photos/pages/settings_page.dart';
-import 'package:album_searcher_for_google_photos/route_paths/route_path.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
-
-class MainRouterDelegate extends RouterDelegate<RoutePath>
-    with ChangeNotifier, PopNavigatorRouterDelegateMixin<RoutePath> {
-  @override
-  final navigatorKey = GlobalKey<NavigatorState>();
-
-  RouterStateData _routerStateData;
-
-  MainRouterDelegate({
-    required RouterStateData routerStateData,
-  }) : _routerStateData = routerStateData;
-
-  RouterStateData get routerStateData => _routerStateData;
-
-  set routerStateData(RouterStateData routerStateData) {
-    if (routerStateData != _routerStateData) {
-      _routerStateData = routerStateData;
-      notifyListeners();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Navigator(
-      key: navigatorKey,
-      pages: [
-        if (routerStateData.selectedIndex == 0)
-          MaterialPage<void>(
-            child: HomePage(),
-            key: ValueKey('home_page'),
-          )
-        else if (routerStateData.selectedIndex == 1)
-          MaterialPage<void>(
-            child: SettingsPage(),
-            key: ValueKey('settings_page'),
-          ),
-      ],
-      onPopPage: (route, result) {
-        if (!route.didPop(result)) {
-          return false;
-        }
-
-        return true;
-      },
-    );
-  }
-
-  @override
-  Future<void> setNewRoutePath(RoutePath path) async {}
-}
diff --git a/lib/services/album_service.dart b/lib/services/album_service.dart
deleted file mode 100644
index 67adef9..0000000
--- a/lib/services/album_service.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-import 'dart:convert';
-
-import 'package:album_searcher_for_google_photos/extensions/response_extensions.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:flutter/widgets.dart';
-
-class AlbumServiceScope extends InheritedWidget {
-  final AlbumService service;
-
-  const AlbumServiceScope({
-    Key? key,
-    required this.service,
-    required Widget child,
-  }) : super(
-          key: key,
-          child: child,
-        );
-
-  static AlbumService of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<AlbumServiceScope>()!
-        .service;
-  }
-
-  @override
-  bool updateShouldNotify(covariant AlbumServiceScope oldWidget) {
-    return oldWidget.service != service;
-  }
-}
-
-class AlbumService {
-  final AuthenticationStateData _authenticationStateData;
-
-  AlbumService({
-    required AuthenticationStateData authenticationStateData,
-  }) : _authenticationStateData = authenticationStateData;
-
-  Future<Album> get(String id) async {
-    final uri = Uri.https(
-      'photoslibrary.googleapis.com',
-      '/v1/albums/$id',
-    );
-
-    final response = await _authenticationStateData.client!.get(uri);
-
-    if (!response.isSuccessStatusCode) {
-      throw Exception(response.body);
-    }
-
-    return Album.fromJson(json.decode(response.body));
-  }
-}
diff --git a/lib/services/authentication/authentication_service.dart b/lib/services/authentication/authentication_service.dart
deleted file mode 100644
index 29c0402..0000000
--- a/lib/services/authentication/authentication_service.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service_stub.dart'
-    if (dart.library.html) 'package:album_searcher_for_google_photos/services/authentication/browser_authentication_service.dart'
-    if (dart.library.io) 'package:album_searcher_for_google_photos/services/authentication/io_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-import 'package:flutter/widgets.dart';
-
-class AuthenticationServiceScope extends InheritedWidget {
-  final AuthenticationService service;
-
-  const AuthenticationServiceScope({
-    Key? key,
-    required this.service,
-    required Widget child,
-  }) : super(
-          key: key,
-          child: child,
-        );
-
-  static AuthenticationService of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<AuthenticationServiceScope>()!
-        .service;
-  }
-
-  @override
-  bool updateShouldNotify(covariant AuthenticationServiceScope oldWidget) {
-    return oldWidget.service != service;
-  }
-}
-
-abstract class AuthenticationService {
-  factory AuthenticationService({
-    required AuthenticationStateData authenticationStateData,
-    required LayoutStateData layoutStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-    required ThemeStateData themeStateData,
-  }) =>
-      createAuthenticationService(
-        authenticationStateData,
-        layoutStateData,
-        sharedAlbumStateData,
-        storageService,
-        themeStateData,
-      );
-
-  Future<void> signInInteractive();
-
-  Future<void> signInSilent();
-
-  Future<void> signOut();
-}
diff --git a/lib/services/authentication/authentication_service_stub.dart b/lib/services/authentication/authentication_service_stub.dart
deleted file mode 100644
index 435bc65..0000000
--- a/lib/services/authentication/authentication_service_stub.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-
-AuthenticationService createAuthenticationService(
-  AuthenticationStateData authenticationStateData,
-  LayoutStateData layoutStateData,
-  SharedAlbumStateData sharedAlbumStateData,
-  StorageService storageService,
-  ThemeStateData themeStateData,
-) =>
-    throw UnsupportedError(
-      'Cannot create an authentication service without dart:html or dart:io.',
-    );
diff --git a/lib/services/authentication/base_authentication_service.dart b/lib/services/authentication/base_authentication_service.dart
deleted file mode 100644
index 74632b7..0000000
--- a/lib/services/authentication/base_authentication_service.dart
+++ /dev/null
@@ -1,70 +0,0 @@
-import 'dart:convert';
-
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
-import 'package:oauth2/oauth2.dart';
-
-abstract class BaseAuthenticationService implements AuthenticationService {
-  @protected
-  final String assetBundleKey;
-  @protected
-  final AuthenticationStateData authenticationStateData;
-  @protected
-  final LayoutStateData layoutStateData;
-  @protected
-  final SharedAlbumStateData sharedAlbumStateData;
-  @protected
-  final StorageService storageService;
-  @protected
-  final ThemeStateData themeStateData;
-
-  BaseAuthenticationService({
-    required this.assetBundleKey,
-    required this.authenticationStateData,
-    required this.layoutStateData,
-    required this.sharedAlbumStateData,
-    required this.storageService,
-    required this.themeStateData,
-  });
-
-  @override
-  Future<void> signInSilent() async {
-    final config = json.decode(await rootBundle.loadString(assetBundleKey));
-
-    final credentials = await storageService.getCredentials();
-
-    if (credentials != null) {
-      final client = Client(
-        credentials,
-        identifier: (config['installed'] ?? config['web'])['client_id'],
-        secret: (config['installed'] ?? config['web'])['client_secret'],
-        onCredentialsRefreshed: onCredentialsRefreshed,
-      );
-
-      await client.refreshCredentials();
-
-      authenticationStateData.client = client;
-    }
-  }
-
-  @override
-  Future<void> signOut() async {
-    await storageService.clear();
-
-    authenticationStateData.client = null;
-    layoutStateData.layoutMode = null;
-    sharedAlbumStateData.sharedAlbums = null;
-    themeStateData.themeMode = null;
-  }
-
-  @protected
-  Future<void> onCredentialsRefreshed(Credentials credentials) async {
-    await storageService.setCredentials(credentials);
-  }
-}
diff --git a/lib/services/authentication/browser_authentication_service.dart b/lib/services/authentication/browser_authentication_service.dart
deleted file mode 100644
index 0bf085d..0000000
--- a/lib/services/authentication/browser_authentication_service.dart
+++ /dev/null
@@ -1,94 +0,0 @@
-import 'dart:convert';
-import 'dart:html'; // ignore: avoid_web_libraries_in_flutter
-
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/base_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-import 'package:flutter/services.dart';
-import 'package:oauth2/oauth2.dart';
-
-AuthenticationService createAuthenticationService(
-  AuthenticationStateData authenticationStateData,
-  LayoutStateData layoutStateData,
-  SharedAlbumStateData sharedAlbumStateData,
-  StorageService storageService,
-  ThemeStateData themeStateData,
-) =>
-    BrowserAuthenticationService(
-      authenticationStateData: authenticationStateData,
-      layoutStateData: layoutStateData,
-      sharedAlbumStateData: sharedAlbumStateData,
-      storageService: storageService,
-      themeStateData: themeStateData,
-    );
-
-class BrowserAuthenticationService extends BaseAuthenticationService {
-  BrowserAuthenticationService({
-    required AuthenticationStateData authenticationStateData,
-    required LayoutStateData layoutStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-    required ThemeStateData themeStateData,
-  }) : super(
-          assetBundleKey: 'files/browser_client_secret.json',
-          authenticationStateData: authenticationStateData,
-          layoutStateData: layoutStateData,
-          sharedAlbumStateData: sharedAlbumStateData,
-          storageService: storageService,
-          themeStateData: themeStateData,
-        );
-
-  @override
-  Future<void> signInInteractive() async {
-    final config = json.decode(await rootBundle.loadString(assetBundleKey));
-
-    final redirectUrl = Uri(
-      scheme: Uri.base.scheme,
-      host: Uri.base.host,
-      port: Uri.base.port,
-      path: '/oauth2redirect.html',
-    );
-
-    final grant = AuthorizationCodeGrant(
-      config['web']['client_id'],
-      Uri.parse(config['web']['auth_uri']),
-      Uri.parse(config['web']['token_uri']),
-      secret: config['web']['client_secret'],
-      onCredentialsRefreshed: onCredentialsRefreshed,
-    );
-
-    final authorizationUrl = grant.getAuthorizationUrl(
-      redirectUrl,
-      scopes: [
-        'openid',
-        'https://www.googleapis.com/auth/photoslibrary.readonly',
-      ],
-    );
-
-    final base = window.open(
-      '$authorizationUrl&access_type=offline',
-      '_blank',
-      'resizable=yes,scrollbars=yes',
-    );
-
-    try {
-      final event = await window.onMessage.firstWhere(
-        (event) => event.data.toString().contains('code'),
-      );
-
-      final client = await grant.handleAuthorizationResponse(
-        Uri.parse(event.data.toString()).queryParameters,
-      );
-
-      await storageService.setCredentials(client.credentials);
-
-      authenticationStateData.client = client;
-    } finally {
-      base.close();
-    }
-  }
-}
diff --git a/lib/services/authentication/desktop_authentication_service.dart b/lib/services/authentication/desktop_authentication_service.dart
deleted file mode 100644
index 5682506..0000000
--- a/lib/services/authentication/desktop_authentication_service.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/io_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-import 'package:flutter/services.dart';
-import 'package:oauth2/oauth2.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-AuthenticationService createAuthenticationService(
-  AuthenticationStateData authenticationStateData,
-  LayoutStateData layoutStateData,
-  SharedAlbumStateData sharedAlbumStateData,
-  StorageService storageService,
-  ThemeStateData themeStateData,
-) =>
-    DesktopAuthenticationService(
-      authenticationStateData: authenticationStateData,
-      layoutStateData: layoutStateData,
-      sharedAlbumStateData: sharedAlbumStateData,
-      storageService: storageService,
-      themeStateData: themeStateData,
-    );
-
-class DesktopAuthenticationService extends IoAuthenticationService {
-  DesktopAuthenticationService({
-    required AuthenticationStateData authenticationStateData,
-    required LayoutStateData layoutStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-    required ThemeStateData themeStateData,
-  }) : super(
-          assetBundleKey: 'files/desktop_client_secret.json',
-          authenticationStateData: authenticationStateData,
-          layoutStateData: layoutStateData,
-          sharedAlbumStateData: sharedAlbumStateData,
-          storageService: storageService,
-          themeStateData: themeStateData,
-        );
-
-  @override
-  Future<void> signInInteractive() async {
-    final config = json.decode(await rootBundle.loadString(assetBundleKey));
-
-    final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
-
-    try {
-      final redirectUrl = Uri.parse(
-        'http://${server.address.host}:${server.port}',
-      );
-
-      final grant = AuthorizationCodeGrant(
-        config['installed']['client_id'],
-        Uri.parse(config['installed']['auth_uri']),
-        Uri.parse(config['installed']['token_uri']),
-        secret: config['installed']['client_secret'],
-        onCredentialsRefreshed: onCredentialsRefreshed,
-      );
-
-      final authorizationUrl = grant.getAuthorizationUrl(
-        redirectUrl,
-        scopes: [
-          'openid',
-          'https://www.googleapis.com/auth/photoslibrary.readonly',
-        ],
-      );
-
-      await launch('$authorizationUrl&access_type=offline');
-
-      final request = await server.firstWhere(
-        (request) => request.uri.queryParameters.containsKey('code'),
-      );
-
-      final client = await grant.handleAuthorizationResponse(
-        request.uri.queryParameters,
-      );
-
-      request.response
-        ..statusCode = 200
-        ..headers.set('content-type', 'text/html; charset=UTF-8')
-        ..write('''
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title>Authentication Complete</title>
-  </head>
-  <body>
-    <p>This window can be closed now.</p>
-  </body>
-</html>''');
-
-      await request.response.close();
-
-      await storageService.setCredentials(client.credentials);
-
-      authenticationStateData.client = client;
-    } finally {
-      await server.close();
-    }
-  }
-}
diff --git a/lib/services/authentication/io_authentication_service.dart b/lib/services/authentication/io_authentication_service.dart
deleted file mode 100644
index 3654850..0000000
--- a/lib/services/authentication/io_authentication_service.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'dart:io';
-
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/base_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/desktop_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/mobile_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-
-AuthenticationService createAuthenticationService(
-  AuthenticationStateData authenticationStateData,
-  LayoutStateData layoutStateData,
-  SharedAlbumStateData sharedAlbumStateData,
-  StorageService storageService,
-  ThemeStateData themeStateData,
-) =>
-    Platform.isLinux || Platform.isMacOS || Platform.isWindows
-        ? DesktopAuthenticationService(
-            authenticationStateData: authenticationStateData,
-            layoutStateData: layoutStateData,
-            sharedAlbumStateData: sharedAlbumStateData,
-            storageService: storageService,
-            themeStateData: themeStateData,
-          )
-        : MobileAuthenticationService(
-            authenticationStateData: authenticationStateData,
-            layoutStateData: layoutStateData,
-            sharedAlbumStateData: sharedAlbumStateData,
-            storageService: storageService,
-            themeStateData: themeStateData,
-          );
-
-abstract class IoAuthenticationService extends BaseAuthenticationService {
-  IoAuthenticationService({
-    required String assetBundleKey,
-    required AuthenticationStateData authenticationStateData,
-    required LayoutStateData layoutStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-    required ThemeStateData themeStateData,
-  }) : super(
-          assetBundleKey: assetBundleKey,
-          authenticationStateData: authenticationStateData,
-          layoutStateData: layoutStateData,
-          sharedAlbumStateData: sharedAlbumStateData,
-          storageService: storageService,
-          themeStateData: themeStateData,
-        );
-}
diff --git a/lib/services/authentication/mobile_authentication_service.dart b/lib/services/authentication/mobile_authentication_service.dart
deleted file mode 100644
index 93ee7b8..0000000
--- a/lib/services/authentication/mobile_authentication_service.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/authentication/io_authentication_service.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-
-AuthenticationService createAuthenticationService(
-  AuthenticationStateData authenticationStateData,
-  LayoutStateData layoutStateData,
-  SharedAlbumStateData sharedAlbumStateData,
-  StorageService storageService,
-  ThemeStateData themeStateData,
-) =>
-    MobileAuthenticationService(
-      authenticationStateData: authenticationStateData,
-      layoutStateData: layoutStateData,
-      sharedAlbumStateData: sharedAlbumStateData,
-      storageService: storageService,
-      themeStateData: themeStateData,
-    );
-
-class MobileAuthenticationService extends IoAuthenticationService {
-  MobileAuthenticationService({
-    required AuthenticationStateData authenticationStateData,
-    required LayoutStateData layoutStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-    required ThemeStateData themeStateData,
-  }) : super(
-          assetBundleKey: 'files/mobile_client_secret.json',
-          authenticationStateData: authenticationStateData,
-          layoutStateData: layoutStateData,
-          sharedAlbumStateData: sharedAlbumStateData,
-          storageService: storageService,
-          themeStateData: themeStateData,
-        );
-
-  @override
-  Future<void> signInInteractive() async {
-    throw UnimplementedError();
-
-    // final config = json.decode(await rootBundle.loadString(assetBundleKey));
-    //
-    // final redirectUrl = Uri.parse(
-    //   'app.thomasclark.albumsearcherforgooglephotos://oauth2redirect',
-    // );
-    //
-    // final grant = AuthorizationCodeGrant(
-    //   config['installed']['client_id'],
-    //   Uri.parse(config['installed']['auth_uri']),
-    //   Uri.parse(config['installed']['token_uri']),
-    //   secret: config['installed']['client_secret'],
-    //   onCredentialsRefreshed: onCredentialsRefreshed,
-    // );
-    //
-    // final authorizationUrl = grant.getAuthorizationUrl(
-    //   redirectUrl,
-    //   scopes: [
-    //     'openid',
-    //     'https://www.googleapis.com/auth/photoslibrary.readonly',
-    //   ],
-    // );
-    //
-    // await launch('$authorizationUrl&access_type=offline');
-    //
-    // final uri = await uriLinkStream.firstWhere(
-    //   (uri) => uri != null && uri.queryParameters.containsKey('code'),
-    // ) as Uri;
-    //
-    // final client = await grant.handleAuthorizationResponse(
-    //   uri.queryParameters,
-    // );
-    //
-    // await storageService.setCredentials(client.credentials);
-    //
-    // authenticationStateData.client = client;
-  }
-}
diff --git a/lib/services/media_item_service.dart b/lib/services/media_item_service.dart
deleted file mode 100644
index d5b108f..0000000
--- a/lib/services/media_item_service.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:album_searcher_for_google_photos/extensions/response_extensions.dart';
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:flutter/widgets.dart';
-
-class MediaItemServiceScope extends InheritedWidget {
-  final MediaItemService service;
-
-  const MediaItemServiceScope({
-    Key? key,
-    required this.service,
-    required Widget child,
-  }) : super(
-          key: key,
-          child: child,
-        );
-
-  static MediaItemService of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<MediaItemServiceScope>()!
-        .service;
-  }
-
-  @override
-  bool updateShouldNotify(covariant MediaItemServiceScope oldWidget) {
-    return oldWidget.service != service;
-  }
-}
-
-class MediaItemService {
-  final AuthenticationStateData _authenticationStateData;
-
-  MediaItemService({
-    required AuthenticationStateData authenticationStateData,
-  }) : _authenticationStateData = authenticationStateData;
-
-  Future<MediaItem> get(String id) async {
-    final uri = Uri.https(
-      'photoslibrary.googleapis.com',
-      '/v1/mediaItems/$id',
-    );
-
-    final response = await _authenticationStateData.client!.get(uri);
-
-    if (!response.isSuccessStatusCode) {
-      throw Exception(response.body);
-    }
-
-    return MediaItem.fromJson(json.decode(response.body));
-  }
-
-  Future<List<MediaItem>> search(String albumId) async {
-    final mediaItems = <MediaItem>[];
-
-    final pageSize = 100;
-    String? pageToken;
-
-    do {
-      final uri = Uri.https(
-        'photoslibrary.googleapis.com',
-        '/v1/mediaItems:search',
-      );
-
-      final response = await _authenticationStateData.client!.post(
-        uri,
-        headers: {
-          HttpHeaders.contentTypeHeader: 'application/json',
-        },
-        body: json.encode({
-          'albumId': albumId,
-          'pageSize': pageSize,
-          if (pageToken != null) 'pageToken': pageToken,
-        }),
-      );
-
-      if (!response.isSuccessStatusCode) {
-        throw Exception(response.body);
-      }
-
-      final data = json.decode(response.body) as Map<String, dynamic>;
-      mediaItems.addAll(
-        (data['mediaItems'] as List).map((e) => MediaItem.fromJson(e)),
-      );
-      pageToken = data['nextPageToken'];
-    } while (pageToken != null);
-
-    return mediaItems;
-  }
-}
diff --git a/lib/services/shared_album_service.dart b/lib/services/shared_album_service.dart
deleted file mode 100644
index 6cffc6e..0000000
--- a/lib/services/shared_album_service.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-import 'dart:convert';
-
-import 'package:album_searcher_for_google_photos/extensions/response_extensions.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/authentication_state.dart';
-import 'package:album_searcher_for_google_photos/states/shared_album_state.dart';
-import 'package:flutter/widgets.dart';
-
-class SharedAlbumServiceScope extends InheritedWidget {
-  final SharedAlbumService service;
-
-  const SharedAlbumServiceScope({
-    Key? key,
-    required this.service,
-    required Widget child,
-  }) : super(
-          key: key,
-          child: child,
-        );
-
-  static SharedAlbumService of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<SharedAlbumServiceScope>()!
-        .service;
-  }
-
-  @override
-  bool updateShouldNotify(covariant SharedAlbumServiceScope oldWidget) {
-    return oldWidget.service != service;
-  }
-}
-
-class SharedAlbumService {
-  final AuthenticationStateData _authenticationStateData;
-  final SharedAlbumStateData _sharedAlbumStateData;
-  final StorageService _storageService;
-
-  SharedAlbumService({
-    required AuthenticationStateData authenticationStateData,
-    required SharedAlbumStateData sharedAlbumStateData,
-    required StorageService storageService,
-  })   : _authenticationStateData = authenticationStateData,
-        _sharedAlbumStateData = sharedAlbumStateData,
-        _storageService = storageService;
-
-  Future<List<Album>> list() async {
-    final sharedAlbums = <Album>[];
-
-    final pageSize = 50;
-    String? pageToken;
-
-    do {
-      final uri = Uri.https(
-        'photoslibrary.googleapis.com',
-        '/v1/sharedAlbums',
-        {
-          'pageSize': '$pageSize',
-          if (pageToken != null) 'pageToken': pageToken,
-        },
-      );
-
-      final response = await _authenticationStateData.client!.get(uri);
-
-      if (!response.isSuccessStatusCode) {
-        throw Exception(response.body);
-      }
-
-      final data = json.decode(response.body) as Map<String, dynamic>;
-      sharedAlbums.addAll(
-        (data['sharedAlbums'] as List).map((e) => Album.fromJson(e)),
-      );
-      pageToken = data['nextPageToken'];
-    } while (pageToken != null);
-
-    await _storageService.setSharedAlbums(sharedAlbums);
-
-    return _sharedAlbumStateData.sharedAlbums = sharedAlbums;
-  }
-}
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
deleted file mode 100644
index db646f2..0000000
--- a/lib/services/storage_service.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-import 'dart:convert';
-
-import 'package:album_searcher_for_google_photos/enums/layout_mode.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:flutter/material.dart';
-import 'package:oauth2/oauth2.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class StorageServiceScope extends InheritedWidget {
-  final StorageService service;
-
-  const StorageServiceScope({
-    Key? key,
-    required this.service,
-    required Widget child,
-  }) : super(
-          key: key,
-          child: child,
-        );
-
-  static StorageService of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<StorageServiceScope>()!
-        .service;
-  }
-
-  @override
-  bool updateShouldNotify(covariant StorageServiceScope oldWidget) {
-    return oldWidget.service != service;
-  }
-}
-
-class StorageService {
-  final _credentialsKey = 'credentials';
-  final _layoutModeKey = 'layoutMode';
-  final _sharedAlbumsKey = 'sharedAlbums';
-  final _sharedPreferences = SharedPreferences.getInstance();
-  final _themeModeKey = 'themeMode';
-
-  Future<void> clear() async {
-    await (await _sharedPreferences).clear();
-  }
-
-  Future<Credentials?> getCredentials() async {
-    final string = (await _sharedPreferences).getString(_credentialsKey);
-
-    return string != null ? Credentials.fromJson(string) : null;
-  }
-
-  Future<LayoutMode?> getLayoutMode() async {
-    final int = (await _sharedPreferences).getInt(_layoutModeKey);
-
-    return int != null ? LayoutMode.values[int] : null;
-  }
-
-  Future<List<Album>?> getSharedAlbums() async {
-    final string = (await _sharedPreferences).getString(_sharedAlbumsKey);
-
-    return string != null
-        ? (json.decode(string) as List).map((e) => Album.fromJson(e)).toList()
-        : null;
-  }
-
-  Future<ThemeMode?> getThemeMode() async {
-    final int = (await _sharedPreferences).getInt(_themeModeKey);
-
-    return int != null ? ThemeMode.values[int] : null;
-  }
-
-  Future<void> removeCredentials() async {
-    await (await _sharedPreferences).remove(_credentialsKey);
-  }
-
-  Future<void> removeLayoutMode() async {
-    await (await _sharedPreferences).remove(_layoutModeKey);
-  }
-
-  Future<void> removeSharedAlbums() async {
-    await (await _sharedPreferences).remove(_sharedAlbumsKey);
-  }
-
-  Future<void> removeThemeMode() async {
-    await (await _sharedPreferences).remove(_themeModeKey);
-  }
-
-  Future<void> setCredentials(Credentials credentials) async {
-    await (await _sharedPreferences).setString(
-      _credentialsKey,
-      credentials.toJson(),
-    );
-  }
-
-  Future<void> setLayoutMode(LayoutMode layoutMode) async {
-    await (await _sharedPreferences).setInt(
-      _layoutModeKey,
-      layoutMode.index,
-    );
-  }
-
-  Future<void> setSharedAlbums(List<Album> sharedAlbums) async {
-    await (await _sharedPreferences).setString(
-      _sharedAlbumsKey,
-      json.encode(sharedAlbums),
-    );
-  }
-
-  Future<void> setThemeMode(ThemeMode themeMode) async {
-    await (await _sharedPreferences).setInt(
-      _themeModeKey,
-      themeMode.index,
-    );
-  }
-}
diff --git a/lib/settings/clear_cache_button.dart b/lib/settings/clear_cache_button.dart
new file mode 100644
index 0000000..eb2d385
--- /dev/null
+++ b/lib/settings/clear_cache_button.dart
@@ -0,0 +1,21 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../common/cache_service.dart';
+
+class ClearCacheButton extends StatelessWidget {
+  const ClearCacheButton({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton.icon(
+      onPressed: () async {
+        await context.read<CacheService>().clear();
+      },
+      icon: const Icon(Icons.refresh),
+      label: const Text('CLEAR CACHE'),
+    );
+  }
+}
diff --git a/lib/settings/layout_dropdown_button_form_field.dart b/lib/settings/layout_dropdown_button_form_field.dart
new file mode 100644
index 0000000..bbf0e29
--- /dev/null
+++ b/lib/settings/layout_dropdown_button_form_field.dart
@@ -0,0 +1,48 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'theme_notifier.dart';
+
+class LayoutDropdownButtonFormField extends StatelessWidget {
+  const LayoutDropdownButtonFormField({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return DropdownButtonFormField(
+      items: const [
+        DropdownMenuItem(
+          value: LayoutMode.grid,
+          child: Text('Grid'),
+        ),
+        DropdownMenuItem(
+          value: LayoutMode.list,
+          child: Text('List'),
+        ),
+      ],
+      value: context.select<ThemeNotifier, LayoutMode>(
+        (notifier) {
+          return notifier.layoutMode;
+        },
+      ),
+      onChanged: (value) async {
+        final notifier = context.read<ThemeNotifier>();
+        final preferences = context.read<SharedPreferences>();
+
+        if (value != null) {
+          await preferences.setInt('layout', value.index);
+        } else {
+          await preferences.remove('layout');
+        }
+
+        notifier.layoutMode = value;
+      },
+      decoration: const InputDecoration(
+        labelText: 'Layout',
+        border: OutlineInputBorder(),
+      ),
+    );
+  }
+}
diff --git a/lib/settings/settings_screen.dart b/lib/settings/settings_screen.dart
new file mode 100644
index 0000000..41f0e60
--- /dev/null
+++ b/lib/settings/settings_screen.dart
@@ -0,0 +1,49 @@
+import 'package:flutter/material.dart';
+
+import '../authentication/sign_out_button.dart';
+import 'clear_cache_button.dart';
+import 'layout_dropdown_button_form_field.dart';
+import 'theme_dropdown_button_form_field.dart';
+
+class SettingsScreen extends StatelessWidget {
+  const SettingsScreen({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.all(8),
+          children: const [
+            Padding(
+              padding: EdgeInsets.all(8),
+              child: LayoutDropdownButtonFormField(),
+            ),
+            Padding(
+              padding: EdgeInsets.all(8),
+              child: ThemeDropdownButtonFormField(),
+            ),
+            Row(
+              children: [
+                Expanded(
+                  child: Padding(
+                    padding: EdgeInsets.all(8),
+                    child: ClearCacheButton(),
+                  ),
+                ),
+                Expanded(
+                  child: Padding(
+                    padding: EdgeInsets.all(8),
+                    child: SignOutButton(),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/settings/theme_dropdown_button_form_field.dart b/lib/settings/theme_dropdown_button_form_field.dart
new file mode 100644
index 0000000..b6f2ead
--- /dev/null
+++ b/lib/settings/theme_dropdown_button_form_field.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import 'theme_notifier.dart';
+
+class ThemeDropdownButtonFormField extends StatelessWidget {
+  const ThemeDropdownButtonFormField({
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return DropdownButtonFormField(
+      items: const [
+        DropdownMenuItem(
+          value: ThemeMode.system,
+          child: Text('System'),
+        ),
+        DropdownMenuItem(
+          value: ThemeMode.light,
+          child: Text('Light'),
+        ),
+        DropdownMenuItem(
+          value: ThemeMode.dark,
+          child: Text('Dark'),
+        ),
+      ],
+      value: context.select<ThemeNotifier, ThemeMode>(
+        (notifier) {
+          return notifier.themeMode;
+        },
+      ),
+      onChanged: (value) async {
+        final notifier = context.read<ThemeNotifier>();
+        final preferences = context.read<SharedPreferences>();
+
+        if (value != null) {
+          await preferences.setInt('theme', value.index);
+        } else {
+          await preferences.remove('theme');
+        }
+
+        notifier.themeMode = value;
+      },
+      decoration: const InputDecoration(
+        labelText: 'Theme',
+        border: OutlineInputBorder(),
+      ),
+    );
+  }
+}
diff --git a/lib/settings/theme_notifier.dart b/lib/settings/theme_notifier.dart
new file mode 100644
index 0000000..80fdb7e
--- /dev/null
+++ b/lib/settings/theme_notifier.dart
@@ -0,0 +1,39 @@
+import 'package:flutter/material.dart';
+
+class ThemeNotifier extends ChangeNotifier {
+  LayoutMode _layoutMode;
+  ThemeMode _themeMode;
+
+  ThemeNotifier({
+    LayoutMode? layoutMode,
+    ThemeMode? themeMode,
+  })  : _layoutMode = layoutMode ?? LayoutMode.list,
+        _themeMode = themeMode ?? ThemeMode.system;
+
+  LayoutMode get layoutMode {
+    return _layoutMode;
+  }
+
+  set layoutMode(LayoutMode? layoutMode) {
+    if (_layoutMode != layoutMode) {
+      _layoutMode = layoutMode ?? LayoutMode.list;
+      notifyListeners();
+    }
+  }
+
+  ThemeMode get themeMode {
+    return _themeMode;
+  }
+
+  set themeMode(ThemeMode? themeMode) {
+    if (_themeMode != themeMode) {
+      _themeMode = themeMode ?? ThemeMode.system;
+      notifyListeners();
+    }
+  }
+}
+
+enum LayoutMode {
+  grid,
+  list,
+}
diff --git a/lib/specifications/album_title_specification.dart b/lib/specifications/album_title_specification.dart
deleted file mode 100644
index b5b1804..0000000
--- a/lib/specifications/album_title_specification.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:album_searcher_for_google_photos/extensions/string_extensions.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/specifications/specification.dart';
-
-class AlbumTitleSpecification extends Specification<Album> {
-  final String title;
-
-  const AlbumTitleSpecification({
-    required this.title,
-  });
-
-  @override
-  bool isSatisfiedBy(Album value) {
-    final title = value.title;
-
-    return title != null && title.uglify().contains(this.title.uglify());
-  }
-}
diff --git a/lib/specifications/and_composite_specification.dart b/lib/specifications/and_composite_specification.dart
deleted file mode 100644
index 235f978..0000000
--- a/lib/specifications/and_composite_specification.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:album_searcher_for_google_photos/specifications/composite_specification.dart';
-import 'package:album_searcher_for_google_photos/specifications/specification.dart';
-
-class AndCompositeSpecification<T> extends CompositeSpecification<T> {
-  AndCompositeSpecification({
-    required Specification<T> left,
-    required Specification<T> right,
-  }) : super(
-          left: left,
-          right: right,
-        );
-
-  @override
-  bool isSatisfiedBy(T value) {
-    return left.isSatisfiedBy(value) && right.isSatisfiedBy(value);
-  }
-}
diff --git a/lib/specifications/composite_specification.dart b/lib/specifications/composite_specification.dart
deleted file mode 100644
index 2a46234..0000000
--- a/lib/specifications/composite_specification.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:album_searcher_for_google_photos/specifications/specification.dart';
-
-abstract class CompositeSpecification<T> extends Specification<T> {
-  CompositeSpecification({
-    required this.left,
-    required this.right,
-  });
-
-  final Specification<T> left;
-
-  final Specification<T> right;
-}
diff --git a/lib/specifications/or_composite_specification.dart b/lib/specifications/or_composite_specification.dart
deleted file mode 100644
index 6260063..0000000
--- a/lib/specifications/or_composite_specification.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:album_searcher_for_google_photos/specifications/composite_specification.dart';
-import 'package:album_searcher_for_google_photos/specifications/specification.dart';
-
-class OrCompositeSpecification<T> extends CompositeSpecification<T> {
-  OrCompositeSpecification({
-    required Specification<T> left,
-    required Specification<T> right,
-  }) : super(
-          left: left,
-          right: right,
-        );
-
-  @override
-  bool isSatisfiedBy(T value) {
-    return left.isSatisfiedBy(value) || right.isSatisfiedBy(value);
-  }
-}
diff --git a/lib/specifications/specification.dart b/lib/specifications/specification.dart
deleted file mode 100644
index 4d6cd1c..0000000
--- a/lib/specifications/specification.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-import 'package:album_searcher_for_google_photos/specifications/and_composite_specification.dart';
-import 'package:album_searcher_for_google_photos/specifications/or_composite_specification.dart';
-
-abstract class Specification<T> {
-  const Specification();
-
-  factory Specification.falsy() => _FalsySpecification<T>();
-
-  factory Specification.truthy() => _TruthySpecification<T>();
-
-  Specification<T> operator &(Specification<T> specification) {
-    return and(specification);
-  }
-
-  Specification<T> operator |(Specification<T> specification) {
-    return or(specification);
-  }
-
-  Specification<T> and(Specification<T> specification) {
-    return AndCompositeSpecification(
-      left: this,
-      right: specification,
-    );
-  }
-
-  bool isSatisfiedBy(T value);
-
-  Specification<T> or(Specification<T> specification) {
-    return OrCompositeSpecification(
-      left: this,
-      right: specification,
-    );
-  }
-}
-
-class _FalsySpecification<T> extends Specification<T> {
-  const _FalsySpecification();
-
-  @override
-  bool isSatisfiedBy(T value) {
-    return false;
-  }
-}
-
-class _TruthySpecification<T> extends Specification<T> {
-  const _TruthySpecification();
-
-  @override
-  bool isSatisfiedBy(T value) {
-    return true;
-  }
-}
diff --git a/lib/states/authentication_state.dart b/lib/states/authentication_state.dart
deleted file mode 100644
index 5333e64..0000000
--- a/lib/states/authentication_state.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:oauth2/oauth2.dart';
-
-class AuthenticationState extends InheritedNotifier<AuthenticationStateData> {
-  const AuthenticationState({
-    Key? key,
-    required AuthenticationStateData notifier,
-    required Widget child,
-  }) : super(
-          key: key,
-          notifier: notifier,
-          child: child,
-        );
-
-  static AuthenticationStateData of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<AuthenticationState>()!
-        .notifier!;
-  }
-}
-
-class AuthenticationStateData extends ChangeNotifier {
-  Client? _client;
-
-  AuthenticationStateData({
-    Client? client,
-  }) : _client = client;
-
-  Client? get client => _client;
-
-  set client(Client? client) {
-    if (client != _client) {
-      _client = client;
-      notifyListeners();
-    }
-  }
-
-  @override
-  void dispose() {
-    _client?.close();
-    super.dispose();
-  }
-}
diff --git a/lib/states/layout_state.dart b/lib/states/layout_state.dart
deleted file mode 100644
index a4974fe..0000000
--- a/lib/states/layout_state.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-import 'package:album_searcher_for_google_photos/enums/layout_mode.dart';
-import 'package:flutter/material.dart';
-
-class LayoutState extends InheritedNotifier<LayoutStateData> {
-  const LayoutState({
-    Key? key,
-    required LayoutStateData notifier,
-    required Widget child,
-  }) : super(
-          key: key,
-          notifier: notifier,
-          child: child,
-        );
-
-  static LayoutStateData of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<LayoutState>()!.notifier!;
-  }
-}
-
-class LayoutStateData extends ChangeNotifier {
-  LayoutMode? _layoutMode;
-
-  LayoutStateData({
-    LayoutMode? layoutMode,
-  }) : _layoutMode = layoutMode;
-
-  LayoutMode get layoutMode => _layoutMode ?? LayoutMode.list;
-
-  set layoutMode(LayoutMode? layoutMode) {
-    if (layoutMode != _layoutMode) {
-      _layoutMode = layoutMode;
-      notifyListeners();
-    }
-  }
-}
diff --git a/lib/states/router_state.dart b/lib/states/router_state.dart
deleted file mode 100644
index 86f3b27..0000000
--- a/lib/states/router_state.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-class RouterState extends InheritedNotifier<RouterStateData> {
-  const RouterState({
-    Key? key,
-    required RouterStateData notifier,
-    required Widget child,
-  }) : super(
-          key: key,
-          notifier: notifier,
-          child: child,
-        );
-
-  static RouterStateData of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<RouterState>()!.notifier!;
-  }
-}
-
-class RouterStateData extends ChangeNotifier {
-  String? _selectedAlbum;
-  int _selectedIndex = 0;
-
-  String? get selectedAlbum => _selectedAlbum;
-
-  set selectedAlbum(String? selectedAlbum) {
-    if (selectedAlbum != _selectedAlbum) {
-      _selectedAlbum = selectedAlbum;
-      notifyListeners();
-    }
-  }
-
-  int get selectedIndex => _selectedIndex;
-
-  set selectedIndex(int selectedIndex) {
-    if (selectedIndex != _selectedIndex) {
-      _selectedIndex = selectedIndex;
-      notifyListeners();
-    }
-  }
-}
diff --git a/lib/states/shared_album_state.dart b/lib/states/shared_album_state.dart
deleted file mode 100644
index c99b561..0000000
--- a/lib/states/shared_album_state.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:flutter/material.dart';
-
-class SharedAlbumState extends InheritedNotifier<SharedAlbumStateData> {
-  const SharedAlbumState({
-    Key? key,
-    required SharedAlbumStateData notifier,
-    required Widget child,
-  }) : super(
-          key: key,
-          notifier: notifier,
-          child: child,
-        );
-
-  static SharedAlbumStateData of(BuildContext context) {
-    return context
-        .dependOnInheritedWidgetOfExactType<SharedAlbumState>()!
-        .notifier!;
-  }
-}
-
-class SharedAlbumStateData extends ChangeNotifier {
-  List<Album>? _sharedAlbums;
-
-  SharedAlbumStateData({
-    List<Album>? sharedAlbums,
-  }) : _sharedAlbums = sharedAlbums;
-
-  List<Album>? get sharedAlbums => _sharedAlbums;
-
-  set sharedAlbums(List<Album>? sharedAlbums) {
-    if (sharedAlbums != _sharedAlbums) {
-      _sharedAlbums = sharedAlbums;
-      notifyListeners();
-    }
-  }
-}
diff --git a/lib/states/theme_state.dart b/lib/states/theme_state.dart
deleted file mode 100644
index 5e9b337..0000000
--- a/lib/states/theme_state.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:flutter/material.dart';
-
-class ThemeState extends InheritedNotifier<ThemeStateData> {
-  const ThemeState({
-    Key? key,
-    required ThemeStateData notifier,
-    required Widget child,
-  }) : super(
-          key: key,
-          notifier: notifier,
-          child: child,
-        );
-
-  static ThemeStateData of(BuildContext context) {
-    return context.dependOnInheritedWidgetOfExactType<ThemeState>()!.notifier!;
-  }
-}
-
-class ThemeStateData extends ChangeNotifier {
-  ThemeMode? _themeMode;
-
-  ThemeStateData({
-    ThemeMode? themeMode,
-  }) : _themeMode = themeMode;
-
-  ThemeMode get themeMode => _themeMode ?? ThemeMode.system;
-
-  set themeMode(ThemeMode? themeMode) {
-    if (themeMode != _themeMode) {
-      _themeMode = themeMode;
-      notifyListeners();
-    }
-  }
-}
diff --git a/lib/widgets/album_card.dart b/lib/widgets/album_card.dart
deleted file mode 100644
index 487d9be..0000000
--- a/lib/widgets/album_card.dart
+++ /dev/null
@@ -1,83 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/services/media_item_service.dart';
-import 'package:album_searcher_for_google_photos/states/router_state.dart';
-import 'package:flutter/material.dart';
-
-class AlbumCard extends StatefulWidget {
-  final Album album;
-
-  const AlbumCard({
-    Key? key,
-    required this.album,
-  }) : super(key: key);
-
-  @override
-  _AlbumCardState createState() => _AlbumCardState();
-}
-
-class _AlbumCardState extends State<AlbumCard> {
-  Future<MediaItem>? _future;
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(4),
-      ),
-      margin: EdgeInsets.zero,
-      child: ClipRRect(
-        borderRadius: BorderRadius.circular(4),
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            FutureBuilder<MediaItem>(
-              future: _future,
-              builder: (context, snapshot) => snapshot.hasData
-                  ? Image.network(
-                      '${snapshot.data!.baseUrl}=w2048-h1024',
-                      color: Color.fromRGBO(0, 0, 0, 0.5),
-                      colorBlendMode: BlendMode.darken,
-                      fit: BoxFit.cover,
-                    )
-                  : Container(),
-            ),
-            Positioned(
-              left: 16,
-              right: 16,
-              bottom: 16,
-              child: Text(
-                widget.album.title ?? widget.album.id,
-                style: Theme.of(context)
-                    .textTheme
-                    .bodyText2!
-                    .copyWith(color: Colors.white),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-            Positioned.fill(
-              child: Material(
-                color: Colors.transparent,
-                child: InkWell(
-                  onTap: () {
-                    RouterState.of(context).selectedAlbum = widget.album.id;
-                  },
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final coverPhotoMediaItemId = widget.album.coverPhotoMediaItemId;
-    if (coverPhotoMediaItemId != null) {
-      _future = MediaItemServiceScope.of(context).get(coverPhotoMediaItemId);
-    }
-  }
-}
diff --git a/lib/widgets/album_open_in_google_photos_icon_button.dart b/lib/widgets/album_open_in_google_photos_icon_button.dart
deleted file mode 100644
index 4594abb..0000000
--- a/lib/widgets/album_open_in_google_photos_icon_button.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class AlbumOpenInGooglePhotosIconButton extends StatelessWidget {
-  const AlbumOpenInGooglePhotosIconButton({
-    Key? key,
-    required this.album,
-  }) : super(key: key);
-
-  final Album album;
-
-  @override
-  Widget build(BuildContext context) {
-    final productUrl = album.productUrl;
-
-    return IconButton(
-      icon: Icon(Icons.open_in_new),
-      onPressed: productUrl != null
-          ? () async {
-              await launch(productUrl);
-            }
-          : null,
-      tooltip: 'Open in Google Photos',
-    );
-  }
-}
diff --git a/lib/widgets/album_sliver_app_bar.dart b/lib/widgets/album_sliver_app_bar.dart
deleted file mode 100644
index 9ffed70..0000000
--- a/lib/widgets/album_sliver_app_bar.dart
+++ /dev/null
@@ -1,119 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/services/media_item_service.dart';
-import 'package:album_searcher_for_google_photos/widgets/album_open_in_google_photos_icon_button.dart';
-import 'package:flutter/material.dart';
-
-class AlbumSliverAppBar extends StatefulWidget {
-  final Album album;
-
-  const AlbumSliverAppBar({
-    Key? key,
-    required this.album,
-  }) : super(key: key);
-
-  @override
-  _AlbumSliverAppBarState createState() => _AlbumSliverAppBarState();
-}
-
-class _AlbumSliverAppBarState extends State<AlbumSliverAppBar> {
-  Future<MediaItem>? _future;
-
-  @override
-  Widget build(BuildContext context) {
-    final coverPhotoBaseUrl = widget.album.coverPhotoBaseUrl;
-
-    if (coverPhotoBaseUrl != null) {
-      return SliverAppBar(
-        actions: [
-          if (widget.album.productUrl != null)
-            AlbumOpenInGooglePhotosIconButton(
-              album: widget.album,
-            ),
-        ],
-        flexibleSpace: FlexibleSpaceBar(
-          title: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(
-                widget.album.title ?? widget.album.id,
-                style: Theme.of(context)
-                    .textTheme
-                    .headline6!
-                    .copyWith(color: Colors.white),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-              Text(
-                '${widget.album.mediaItemsCount ?? '-'} items',
-                style: Theme.of(context)
-                    .textTheme
-                    .caption!
-                    .copyWith(color: Colors.white.withAlpha(150)),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ],
-          ),
-          background: Stack(
-            fit: StackFit.expand,
-            children: [
-              FutureBuilder<MediaItem>(
-                future: _future,
-                builder: (context, snapshot) => snapshot.hasData
-                    ? Image.network(
-                        '${snapshot.data!.baseUrl}=w2048-h1024',
-                        color: Color.fromRGBO(0, 0, 0, 0.5),
-                        colorBlendMode: BlendMode.darken,
-                        fit: BoxFit.cover,
-                      )
-                    : Container(),
-              ),
-            ],
-          ),
-          titlePadding: const EdgeInsets.only(left: 72, bottom: 8),
-        ),
-        expandedHeight: MediaQuery.of(context).size.height * 0.5,
-        pinned: true,
-      );
-    } else {
-      return SliverAppBar(
-        title: Column(
-          mainAxisAlignment: MainAxisAlignment.end,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              widget.album.title ?? widget.album.id,
-              style: Theme.of(context).textTheme.headline6,
-              overflow: TextOverflow.ellipsis,
-              maxLines: 1,
-            ),
-            Text(
-              '${widget.album.mediaItemsCount ?? '-'} items',
-              style: Theme.of(context).textTheme.caption,
-              overflow: TextOverflow.ellipsis,
-              maxLines: 1,
-            ),
-          ],
-        ),
-        actions: [
-          if (widget.album.productUrl != null)
-            AlbumOpenInGooglePhotosIconButton(
-              album: widget.album,
-            ),
-        ],
-        pinned: true,
-      );
-    }
-  }
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final coverPhotoMediaItemId = widget.album.coverPhotoMediaItemId;
-    if (coverPhotoMediaItemId != null) {
-      _future = MediaItemServiceScope.of(context).get(coverPhotoMediaItemId);
-    }
-  }
-}
diff --git a/lib/widgets/albums_sliver_grid.dart b/lib/widgets/albums_sliver_grid.dart
deleted file mode 100644
index 262b756..0000000
--- a/lib/widgets/albums_sliver_grid.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/widgets/album_card.dart';
-import 'package:flutter/material.dart';
-
-class AlbumsSliverGrid extends StatelessWidget {
-  final List<Album> albums;
-
-  const AlbumsSliverGrid({
-    Key? key,
-    required this.albums,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverGrid(
-      delegate: SliverChildBuilderDelegate(
-        (context, index) => Padding(
-          padding: const EdgeInsets.all(8),
-          child: AlbumCard(
-            key: ValueKey(albums[index]),
-            album: albums[index],
-          ),
-        ),
-        childCount: albums.length,
-      ),
-      gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-        maxCrossAxisExtent: 500,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/albums_sliver_list.dart b/lib/widgets/albums_sliver_list.dart
deleted file mode 100644
index d45a1ee..0000000
--- a/lib/widgets/albums_sliver_list.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/album.dart';
-import 'package:album_searcher_for_google_photos/widgets/album_list_tile.dart';
-import 'package:flutter/material.dart';
-
-class AlbumsSliverList extends StatelessWidget {
-  final List<Album> albums;
-
-  const AlbumsSliverList({
-    Key? key,
-    required this.albums,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverList(
-      delegate: SliverChildBuilderDelegate(
-        (context, index) => AlbumListTile(
-          key: ValueKey(albums[index]),
-          album: albums[index],
-        ),
-        childCount: albums.length,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/layout_dropdown_form_field.dart b/lib/widgets/layout_dropdown_form_field.dart
deleted file mode 100644
index ee6bf01..0000000
--- a/lib/widgets/layout_dropdown_form_field.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-import 'package:album_searcher_for_google_photos/enums/layout_mode.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/layout_state.dart';
-import 'package:flutter/material.dart';
-
-class LayoutDropdownButtonFormField extends StatelessWidget {
-  const LayoutDropdownButtonFormField({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return DropdownButtonFormField<LayoutMode>(
-      items: [
-        DropdownMenuItem(
-          value: LayoutMode.grid,
-          child: Text('Grid'),
-        ),
-        DropdownMenuItem(
-          value: LayoutMode.list,
-          child: Text('List'),
-        ),
-      ],
-      value: LayoutState.of(context).layoutMode,
-      onChanged: (value) async {
-        if (value != null) {
-          await StorageServiceScope.of(context).setLayoutMode(value);
-        }
-
-        LayoutState.of(context).layoutMode = value;
-      },
-      decoration: InputDecoration(
-        labelText: 'Layout',
-        border: OutlineInputBorder(),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/media_item_card.dart b/lib/widgets/media_item_card.dart
deleted file mode 100644
index 1424733..0000000
--- a/lib/widgets/media_item_card.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:flutter/material.dart';
-
-class MediaItemCard extends StatelessWidget {
-  final MediaItem mediaItem;
-
-  const MediaItemCard({
-    Key? key,
-    required this.mediaItem,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(4),
-      ),
-      margin: EdgeInsets.zero,
-      child: ClipRRect(
-        borderRadius: BorderRadius.circular(4),
-        child: Stack(
-          fit: StackFit.expand,
-          children: [
-            if (mediaItem.baseUrl != null)
-              Image.network(
-                '${mediaItem.baseUrl}=w2048-h1024',
-                color: Color.fromRGBO(0, 0, 0, 0.5),
-                colorBlendMode: BlendMode.darken,
-                fit: BoxFit.cover,
-              ),
-            Positioned(
-              left: 16,
-              right: 16,
-              bottom: 16,
-              child: Text(
-                mediaItem.filename ?? mediaItem.id,
-                style: Theme.of(context)
-                    .textTheme
-                    .bodyText2!
-                    .copyWith(color: Colors.white),
-                overflow: TextOverflow.ellipsis,
-                maxLines: 1,
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/media_items_sliver_grid.dart b/lib/widgets/media_items_sliver_grid.dart
deleted file mode 100644
index 6263f07..0000000
--- a/lib/widgets/media_items_sliver_grid.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/widgets/media_item_card.dart';
-import 'package:flutter/material.dart';
-
-class MediaItemsSliverGrid extends StatelessWidget {
-  final List<MediaItem> mediaItems;
-
-  const MediaItemsSliverGrid({
-    Key? key,
-    required this.mediaItems,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverGrid(
-      delegate: SliverChildBuilderDelegate(
-        (context, index) => Padding(
-          padding: const EdgeInsets.all(8),
-          child: MediaItemCard(
-            key: ValueKey(mediaItems[index]),
-            mediaItem: mediaItems[index],
-          ),
-        ),
-        childCount: mediaItems.length,
-      ),
-      gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
-        maxCrossAxisExtent: 500,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/media_items_sliver_list.dart b/lib/widgets/media_items_sliver_list.dart
deleted file mode 100644
index 10c6073..0000000
--- a/lib/widgets/media_items_sliver_list.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-import 'package:album_searcher_for_google_photos/models/media_item.dart';
-import 'package:album_searcher_for_google_photos/widgets/media_item_list_tile.dart';
-import 'package:flutter/material.dart';
-
-class MediaItemsSliverList extends StatelessWidget {
-  final List<MediaItem> mediaItems;
-
-  const MediaItemsSliverList({
-    Key? key,
-    required this.mediaItems,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return SliverList(
-      delegate: SliverChildBuilderDelegate(
-        (context, index) => MediaItemListTile(
-          key: ValueKey(mediaItems[index]),
-          mediaItem: mediaItems[index],
-        ),
-        childCount: mediaItems.length,
-      ),
-    );
-  }
-}
diff --git a/lib/widgets/sign_in_elevated_button.dart b/lib/widgets/sign_in_elevated_button.dart
deleted file mode 100644
index 869954e..0000000
--- a/lib/widgets/sign_in_elevated_button.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:flutter/material.dart';
-
-class SignInElevatedButton extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    return ElevatedButton(
-      onPressed: () async {
-        try {
-          await AuthenticationServiceScope.of(context).signInInteractive();
-        } catch (e) {
-          await showDialog<void>(
-            context: context,
-            builder: (context) => AlertDialog(
-              title: Text('Error'),
-              content: Text(e.toString()),
-              actions: [
-                TextButton(
-                  onPressed: () => Navigator.of(context).pop(),
-                  child: Text('OK'),
-                ),
-              ],
-            ),
-          );
-        }
-      },
-      child: Text('SIGN IN'),
-    );
-  }
-}
diff --git a/lib/widgets/sign_out_floating_action_button.dart b/lib/widgets/sign_out_floating_action_button.dart
deleted file mode 100644
index 95079cd..0000000
--- a/lib/widgets/sign_out_floating_action_button.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:album_searcher_for_google_photos/services/authentication/authentication_service.dart';
-import 'package:flutter/material.dart';
-
-class SignOutFloatingActionButton extends StatelessWidget {
-  const SignOutFloatingActionButton({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return FloatingActionButton(
-      child: Icon(Icons.logout),
-      tooltip: 'Sign out',
-      onPressed: () async {
-        try {
-          await AuthenticationServiceScope.of(context).signOut();
-        } catch (e) {
-          await showDialog<void>(
-            context: context,
-            builder: (context) => AlertDialog(
-              title: Text('Error'),
-              content: Text(e.toString()),
-              actions: [
-                TextButton(
-                  onPressed: () => Navigator.of(context).pop(),
-                  child: Text('OK'),
-                ),
-              ],
-            ),
-          );
-        }
-      },
-    );
-  }
-}
diff --git a/lib/widgets/theme_dropdown_form_field.dart b/lib/widgets/theme_dropdown_form_field.dart
deleted file mode 100644
index cb46816..0000000
--- a/lib/widgets/theme_dropdown_form_field.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:album_searcher_for_google_photos/services/storage_service.dart';
-import 'package:album_searcher_for_google_photos/states/theme_state.dart';
-
-class ThemeDropdownButtonFormField extends StatelessWidget {
-  const ThemeDropdownButtonFormField({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return DropdownButtonFormField<ThemeMode>(
-      items: [
-        DropdownMenuItem(
-          value: ThemeMode.system,
-          child: Text('System'),
-        ),
-        DropdownMenuItem(
-          value: ThemeMode.light,
-          child: Text('Light'),
-        ),
-        DropdownMenuItem(
-          value: ThemeMode.dark,
-          child: Text('Dark'),
-        ),
-      ],
-      value: ThemeState.of(context).themeMode,
-      onChanged: (value) async {
-        if (value != null) {
-          await StorageServiceScope.of(context).setThemeMode(value);
-        }
-
-        ThemeState.of(context).themeMode = value;
-      },
-      decoration: InputDecoration(
-        labelText: 'Theme',
-        border: OutlineInputBorder(),
-      ),
-    );
-  }
-}
diff --git a/linux/.gitignore b/linux/.gitignore
new file mode 100644
index 0000000..d3896c9
--- /dev/null
+++ b/linux/.gitignore
@@ -0,0 +1 @@
+flutter/ephemeral
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
new file mode 100644
index 0000000..b94634a
--- /dev/null
+++ b/linux/CMakeLists.txt
@@ -0,0 +1,145 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.10)
+project(runner LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "google_photos_album_searcher")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
+set(APPLICATION_ID "app.thomasclark.googlephotosalbumsearcher")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(SET CMP0063 NEW)
+
+# Load bundled libraries from the lib/ directory relative to the binary.
+set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
+
+# Root filesystem for cross-building.
+if(FLUTTER_TARGET_PLATFORM_SYSROOT)
+  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+# Define build configuration options.
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE
+    STRING "Flutter build mode" FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+    "Debug" "Profile" "Release")
+endif()
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_14)
+  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
+  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+
+add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
+
+# Define the application target. To change its name, change BINARY_NAME above,
+# not the value here, or `flutter run` will no longer work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME}
+  "main.cc"
+  "my_application.cc"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add dependency libraries. Add any application-specific dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
+
+# Only the install-generated bundle's copy of the executable will launch
+# correctly, since the resources must in the right relative locations. To avoid
+# people trying to run the unbundled copy, put it in a subdirectory instead of
+# the default top-level location.
+set_target_properties(${BINARY_NAME}
+  PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+)
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# By default, "installing" just makes a relocatable bundle in the build
+# directory.
+set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+# Start with a clean build bundle directory every time.
+install(CODE "
+  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
+  " COMPONENT Runtime)
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endforeach(bundled_library)
+
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+   COMPONENT Runtime)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()
diff --git a/linux/flutter/CMakeLists.txt b/linux/flutter/CMakeLists.txt
new file mode 100644
index 0000000..d5bd016
--- /dev/null
+++ b/linux/flutter/CMakeLists.txt
@@ -0,0 +1,88 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.10)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+
+# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
+# which isn't available in 3.10.
+function(list_prepend LIST_NAME PREFIX)
+    set(NEW_LIST "")
+    foreach(element ${${LIST_NAME}})
+        list(APPEND NEW_LIST "${PREFIX}${element}")
+    endforeach(element)
+    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
+endfunction()
+
+# === Flutter Library ===
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "fl_basic_message_channel.h"
+  "fl_binary_codec.h"
+  "fl_binary_messenger.h"
+  "fl_dart_project.h"
+  "fl_engine.h"
+  "fl_json_message_codec.h"
+  "fl_json_method_codec.h"
+  "fl_message_codec.h"
+  "fl_method_call.h"
+  "fl_method_channel.h"
+  "fl_method_codec.h"
+  "fl_method_response.h"
+  "fl_plugin_registrar.h"
+  "fl_plugin_registry.h"
+  "fl_standard_message_codec.h"
+  "fl_standard_method_codec.h"
+  "fl_string_codec.h"
+  "fl_value.h"
+  "fl_view.h"
+  "flutter_linux.h"
+)
+list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
+target_link_libraries(flutter INTERFACE
+  PkgConfig::GTK
+  PkgConfig::GLIB
+  PkgConfig::GIO
+)
+add_dependencies(flutter flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
+      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+)
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 0000000..f6f23bf
--- /dev/null
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+#include <url_launcher_linux/url_launcher_plugin.h>
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
+  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
+}
diff --git a/linux/flutter/generated_plugin_registrant.h b/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 0000000..e0f0a47
--- /dev/null
+++ b/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
new file mode 100644
index 0000000..f16b4c3
--- /dev/null
+++ b/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,24 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+  url_launcher_linux
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/linux/main.cc b/linux/main.cc
new file mode 100644
index 0000000..e7c5c54
--- /dev/null
+++ b/linux/main.cc
@@ -0,0 +1,6 @@
+#include "my_application.h"
+
+int main(int argc, char** argv) {
+  g_autoptr(MyApplication) app = my_application_new();
+  return g_application_run(G_APPLICATION(app), argc, argv);
+}
diff --git a/linux/my_application.cc b/linux/my_application.cc
new file mode 100644
index 0000000..2d52702
--- /dev/null
+++ b/linux/my_application.cc
@@ -0,0 +1,124 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.h"
+
+struct _MyApplication {
+  GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
+};
+
+G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
+
+// Implements GApplication::activate.
+static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
+  GtkWindow* window =
+      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "Album Searcher for Google Photos");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "Album Searcher for Google Photos");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_widget_show(GTK_WIDGET(window));
+
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+
+  FlView* view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(view));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+
+  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+
+  gtk_widget_grab_focus(GTK_WIDGET(view));
+}
+
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GApplication::startup.
+static void my_application_startup(GApplication* application) {
+  //MyApplication* self = MY_APPLICATION(object);
+
+  // Perform any actions required at application startup.
+
+  G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
+}
+
+// Implements GApplication::shutdown.
+static void my_application_shutdown(GApplication* application) {
+  //MyApplication* self = MY_APPLICATION(object);
+
+  // Perform any actions required at application shutdown.
+
+  G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
+static void my_application_class_init(MyApplicationClass* klass) {
+  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_APPLICATION_CLASS(klass)->startup = my_application_startup;
+  G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
+}
+
+static void my_application_init(MyApplication* self) {}
+
+MyApplication* my_application_new() {
+  return MY_APPLICATION(g_object_new(my_application_get_type(),
+                                     "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     nullptr));
+}
diff --git a/linux/my_application.h b/linux/my_application.h
new file mode 100644
index 0000000..72271d5
--- /dev/null
+++ b/linux/my_application.h
@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+                     GtkApplication)
+
+/**
+ * my_application_new:
+ *
+ * Creates a new Flutter-based application.
+ *
+ * Returns: a new #MyApplication.
+ */
+MyApplication* my_application_new();
+
+#endif  // FLUTTER_MY_APPLICATION_H_
diff --git a/pubspec.lock b/pubspec.lock
index cde1f1b..592fa01 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,256 +1,163 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
+  _discoveryapis_commons:
     dependency: transitive
     description:
-      name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      name: _discoveryapis_commons
+      sha256: f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d
+      url: "https://pub.dev"
     source: hosted
-    version: "18.0.0"
-  analyzer:
+    version: "1.0.6"
+  _flutterfire_internals:
     dependency: transitive
     description:
-      name: analyzer
-      url: "https://pub.dartlang.org"
+      name: _flutterfire_internals
+      sha256: "0816f12bbbd9e21f72ea8592b11bce4a628d4e5cb7a81ff9f1eee4f3dc23206e"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
+    version: "1.3.37"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.5.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  build:
-    dependency: transitive
-    description:
-      name: build
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  build_config:
-    dependency: transitive
-    description:
-      name: build_config
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.7"
-  build_daemon:
-    dependency: transitive
-    description:
-      name: build_daemon
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.10"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  build_runner:
-    dependency: "direct dev"
-    description:
-      name: build_runner
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.12.2"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.12"
-  built_collection:
-    dependency: transitive
-    description:
-      name: built_collection
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.0"
-  built_value:
-    dependency: transitive
-    description:
-      name: built_value
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "8.0.3"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  code_builder:
-    dependency: transitive
-    description:
-      name: code_builder
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.7.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.15.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      url: "https://pub.dartlang.org"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "1.18.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
-  dart_style:
-    dependency: transitive
+    version: "3.0.3"
+  cupertino_icons:
+    dependency: "direct main"
     description:
-      name: dart_style
-      url: "https://pub.dartlang.org"
+      name: cupertino_icons
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.8"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "2.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
-  firebase:
-    dependency: transitive
-    description:
-      name: firebase
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "9.0.1"
+    version: "7.0.0"
   firebase_analytics:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: firebase_analytics
-      url: "https://pub.dartlang.org"
+      sha256: "3363045ecc3141673262493eea4bd888c2c627c5e986b8766fa5f4bfafdbcdd8"
+      url: "https://pub.dev"
     source: hosted
-    version: "7.1.1"
+    version: "11.0.1"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_analytics_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "5a2c14e18bf6c4423a6462113d85d3dee534a8bdd620391729e9570632d2aec4"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "4.0.1"
   firebase_analytics_web:
     dependency: transitive
     description:
       name: firebase_analytics_web
-      url: "https://pub.dartlang.org"
+      sha256: db4bdb166aae9e5a0ce7791672401db139cd342369a92f7eaf020dbff9df2998
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+1"
+    version: "0.5.7+9"
   firebase_core:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: firebase_core
-      url: "https://pub.dartlang.org"
+      sha256: fae4ab4317c2a7afb13d44ef1e3f9f28a630e10016bc5cfe761e8e6a0ed7816a
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "3.1.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "1003a5a03a61fc9a22ef49f37cbcb9e46c86313a7b2e7029b9390cf8c6fc32cb"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "5.1.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      url: "https://pub.dartlang.org"
+      sha256: "6643fe3dbd021e6ccfb751f7882b39df355708afbdeb4130fc50f9305a9d1a3d"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
+    version: "2.17.2"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_svg:
-    dependency: "direct main"
+  flutter_lints:
+    dependency: "direct dev"
     description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
+      name: flutter_lints
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.21.0-nullsafety.0"
+    version: "4.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -261,431 +168,468 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  glob:
-    dependency: transitive
+  go_router:
+    dependency: "direct main"
     description:
-      name: glob
-      url: "https://pub.dartlang.org"
+      name: go_router
+      sha256: cdae1b9c8bd7efadcef6112e81c903662ef2ce105cbd220a04bbb7c3425b5554
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  graphs:
+    version: "14.2.0"
+  google_identity_services_web:
     dependency: transitive
     description:
-      name: graphs
-      url: "https://pub.dartlang.org"
+      name: google_identity_services_web
+      sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
-  http:
+    version: "0.3.1+1"
+  google_sign_in:
     dependency: "direct main"
     description:
-      name: http
-      url: "https://pub.dartlang.org"
+      name: google_sign_in
+      sha256: "0b8787cb9c1a68ad398e8010e8c8766bfa33556d2ab97c439fb4137756d7308f"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.13.1"
-  http_multi_server:
+    version: "6.2.1"
+  google_sign_in_android:
+    dependency: transitive
+    description:
+      name: google_sign_in_android
+      sha256: "8f2606fffd912ff8c23e8d94da106764c116112ce65fb18c78123331ae628eb3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.24"
+  google_sign_in_desktop:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: aa99e2f8da3bd5b932a21cc0472c18695f964214
+      url: "https://github.com/tnc1997/flutter-google-sign-in-desktop.git"
+    source: git
+    version: "0.0.0"
+  google_sign_in_ios:
     dependency: transitive
     description:
-      name: http_multi_server
-      url: "https://pub.dartlang.org"
+      name: google_sign_in_ios
+      sha256: a058c9880be456f21e2e8571c1126eaacd570bdc5b6c6d9d15aea4bdf22ca9fe
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "5.7.6"
+  google_sign_in_platform_interface:
+    dependency: "direct main"
+    description:
+      name: google_sign_in_platform_interface
+      sha256: "1f6e5787d7a120cc0359ddf315c92309069171306242e181c09472d1b00a2971"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.5"
+  google_sign_in_web:
+    dependency: "direct main"
+    description:
+      name: google_sign_in_web
+      sha256: fc0f14ed45ea616a6cfb4d1c7534c2221b7092cc4f29a709f0c3053cc3e821bd
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.4"
+  googleapis:
+    dependency: "direct main"
+    description:
+      name: googleapis
+      sha256: "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.2.0"
+  http:
+    dependency: "direct main"
+    description:
+      name: http
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
-  io:
+    version: "4.0.2"
+  leak_tracker:
     dependency: transitive
     description:
-      name: io
-      url: "https://pub.dartlang.org"
+      name: leak_tracker
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
-  js:
+    version: "10.0.5"
+  leak_tracker_flutter_testing:
     dependency: transitive
     description:
-      name: js
-      url: "https://pub.dartlang.org"
+      name: leak_tracker_flutter_testing
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.3"
-  json_annotation:
-    dependency: "direct main"
+    version: "3.0.5"
+  leak_tracker_testing:
+    dependency: transitive
     description:
-      name: json_annotation
-      url: "https://pub.dartlang.org"
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
-  json_serializable:
-    dependency: "direct dev"
+    version: "3.0.1"
+  lints:
+    dependency: transitive
     description:
-      name: json_serializable
-      url: "https://pub.dartlang.org"
+      name: lints
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.12.16+1"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
-  mime:
+    version: "1.14.0"
+  nested:
     dependency: transitive
     description:
-      name: mime
-      url: "https://pub.dartlang.org"
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
-  oauth2:
+  path:
     dependency: "direct main"
     description:
-      name: oauth2
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      url: "https://pub.dartlang.org"
+      name: path
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  path:
-    dependency: transitive
+    version: "1.9.0"
+  path_provider:
+    dependency: "direct main"
     description:
-      name: path
-      url: "https://pub.dartlang.org"
+      name: path_provider
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
-  path_drawing:
+    version: "2.1.3"
+  path_provider_android:
     dependency: transitive
     description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
+      name: path_provider_android
+      sha256: "9c96da072b421e98183f9ea7464898428e764bc0ce5567f27ec8693442e72514"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.5.0-nullsafety.0"
-  path_parsing:
+    version: "2.2.5"
+  path_provider_foundation:
     dependency: transitive
     description:
-      name: path_parsing
-      url: "https://pub.dartlang.org"
+      name: path_provider_foundation
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0-nullsafety.0"
+    version: "2.4.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.11.0"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "2.2.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  pool:
-    dependency: transitive
+    version: "2.1.8"
+  provider:
+    dependency: "direct main"
     description:
-      name: pool
-      url: "https://pub.dartlang.org"
+      name: provider
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
-  process:
-    dependency: transitive
+    version: "6.1.2"
+  shared_preferences:
+    dependency: "direct main"
     description:
-      name: process
-      url: "https://pub.dartlang.org"
+      name: shared_preferences
+      sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
-  pub_semver:
+    version: "2.2.3"
+  shared_preferences_android:
     dependency: transitive
     description:
-      name: pub_semver
-      url: "https://pub.dartlang.org"
+      name: shared_preferences_android
+      sha256: "93d0ec9dd902d85f326068e6a899487d1f65ffcd5798721a95330b26c8131577"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  pubspec_parse:
+    version: "2.2.3"
+  shared_preferences_foundation:
     dependency: transitive
     description:
-      name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      name: shared_preferences_foundation
+      sha256: "0a8a893bf4fd1152f93fec03a415d11c27c74454d96e2318a7ac38dd18683ab7"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
-  shared_preferences:
-    dependency: "direct main"
-    description:
-      name: shared_preferences
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
+    version: "2.4.0"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  shared_preferences_macos:
-    dependency: transitive
-    description:
-      name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.2"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.2"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.0"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "2.3.2"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
-  source_gen:
-    dependency: transitive
-    description:
-      name: source_gen
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.19"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
+    version: "0.7.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.2"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      url: "https://pub.dartlang.org"
+      sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.0"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      sha256: ceb2625f0c24ade6ef6778d1de0b2e44f2db71fded235eb52295247feba8c5cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.3"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      sha256: "7068716403343f6ba4969b4173cbf3b84fc768042124bc2c011e5d782b24fe89"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.0.2"
+    version: "6.3.0"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      url: "https://pub.dartlang.org"
+      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.1.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      url: "https://pub.dartlang.org"
+      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.2.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.3.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      url: "https://pub.dartlang.org"
+      sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.3.1"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      url: "https://pub.dartlang.org"
+      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "3.1.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
-  watcher:
+    version: "2.1.4"
+  vm_service:
     dependency: transitive
     description:
-      name: watcher
-      url: "https://pub.dartlang.org"
+      name: vm_service
+      sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
-  web_socket_channel:
-    dependency: transitive
+    version: "14.2.2"
+  web:
+    dependency: "direct main"
     description:
-      name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      name: web
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "0.5.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      sha256: a79dbe579cb51ecd6d30b17e0cae4e0ea15e2c0e66f69ad4198f22a6789e94f4
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "5.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
-  xml:
-    dependency: transitive
-    description:
-      name: xml
-      url: "https://pub.dartlang.org"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.0"
+    version: "1.0.4"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.24.0-7.0"
+  dart: ">=3.4.0 <4.0.0"
+  flutter: ">=3.22.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1af49d2..c0bb531 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,9 @@
-name: album_searcher_for_google_photos
-description: >
-  Album Searcher for Google Photos gives you an enhanced search experience for
-  shared albums.
+name: google_photos_album_searcher
+description: Please note that Album Searcher for Google Photos is unofficial and not endorsed by Google.
 
 # The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+# pub.dev using `flutter pub publish`. This is preferred for private packages.
+publish_to: none # Remove this line if you wish to publish to pub.dev
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
@@ -14,37 +12,52 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # build by specifying --build-name and --build-number, respectively.
 # In Android, build-name is used as versionName while build-number used as versionCode.
 # Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.4+10004
+# In Windows, build-name is used as the major, minor, and patch parts
+# of the product and file versions while build-number is used as the build suffix.
+version: 1.0.5+10005
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ^3.0.0
 
+# Dependencies specify other packages that your package needs in order to work.
+# To automatically upgrade your package dependencies to the latest versions
+# consider running `flutter pub upgrade --major-versions`. Alternatively,
+# dependencies can be manually updated by changing the version numbers below to
+# the latest version available on pub.dev. To see which dependencies have newer
+# versions available, run `flutter pub outdated`.
 dependencies:
+  cupertino_icons: ^1.0.8
+  firebase_analytics: ^11.0.1
+  firebase_core: ^3.1.0
   flutter:
     sdk: flutter
-  flutter_svg: ^0.21.0-nullsafety.0
-  http: ^0.13.0
-  json_annotation: ^4.0.0
-  oauth2: ^2.0.0
-  shared_preferences: ^2.0.0
-  url_launcher: ^6.0.0
+  go_router: ^14.1.4
+  google_sign_in: ^6.2.1
+  google_sign_in_desktop:
+     git: https://github.com/tnc1997/flutter-google-sign-in-desktop.git
+  google_sign_in_platform_interface: ^2.4.5
+  google_sign_in_web: ^0.12.4
+  googleapis: ^13.1.0
+  http: ^1.2.1
+  path: ^1.9.0
+  path_provider: ^2.1.3
+  provider: ^6.1.2
+  shared_preferences: ^2.2.3
+  url_launcher: ^6.2.6
+  web: ^0.5.1
 
 dev_dependencies:
-  build_runner: ^1.0.0
-  firebase_analytics: ^7.0.0
-  firebase_core: ^1.0.0
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
-  json_serializable: ^4.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
-# The following section is specific to Flutter.
-flutter:
 
+flutter:
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.
@@ -56,14 +69,13 @@ flutter:
   #   - images/a_dot_ham.jpeg
   #
   # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
+  # https://flutter.dev/assets-and-images/#resolution-aware
   #
   # For details regarding adding assets from package dependencies, see
   # https://flutter.dev/assets-and-images/#from-packages
   assets:
-    - files/browser_client_secret.json
-    - files/desktop_client_secret.json
-    - images/image-search.svg
+    - images/image-search.png
+
   # To add custom fonts to your application, add a fonts section here,
   # in this "flutter" section. Each entry in this list should have a
   # "family" key with the font family name, and a "fonts" key with a
diff --git a/scripts/standard-version-updater.js b/scripts/standard-version-updater.js
deleted file mode 100644
index 98f83e9..0000000
--- a/scripts/standard-version-updater.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const { major, minor, patch } = require("semver");
-const YAML = require("yaml");
-
-module.exports.readVersion = function (contents) {
-    return YAML.parseDocument(contents).get("version").split("+")[0];
-}
-
-module.exports.writeVersion = function (contents, version) {
-    const document = YAML.parseDocument(contents);
-    document.set("version", `${version}+${(major(version) * 10000) + (minor(version) * 100) + (patch(version))}`);
-    return document.toString();
-}
diff --git a/setup.iss b/setup.iss
new file mode 100644
index 0000000..abe95b4
--- /dev/null
+++ b/setup.iss
@@ -0,0 +1,76 @@
+#define MyAppName "Album Searcher for Google Photos"
+#define MyAppVersion "1.0.5"
+#define MyAppPublisher "Thomas Clark"
+#define MyAppURL "https://googlephotosalbumsearcher.thomasclark.app"
+#define MyAppExeName "google_photos_album_searcher.exe"
+
+[Setup]
+AppId={{9DD0AF3C-5FAF-42D5-BDD3-66CFE6C4BC99}
+AppName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+AppVersion={#MyAppVersion}
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
+DefaultDirName={autopf}\{#MyAppName}
+LicenseFile=LICENSE
+PrivilegesRequiredOverridesAllowed=dialog
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: createallsubdirs ignoreversion recursesubdirs
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{tmp}\vc_redist.exe"; Parameters: "/install /passive /norestart"; Check: VCRedistNeedsInstall
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Code]
+var
+  DownloadPage: TDownloadWizardPage;
+procedure InitializeWizard;
+begin
+  DownloadPage := CreateDownloadPage(SetupMessage(msgWizardPreparing), SetupMessage(msgPreparingDesc), nil);
+end;
+function NextButtonClick(CurPageID: Integer): Boolean;
+begin
+  if CurPageID = wpReady then
+  begin
+    DownloadPage.Clear;
+    DownloadPage.Add('https://aka.ms/vs/17/release/vc_redist.x64.exe', 'vc_redist.exe', '');
+    DownloadPage.Show;
+    try
+      try
+        DownloadPage.Download;
+        Result := True;
+      except
+        if not DownloadPage.AbortedByUser then
+          SuppressibleMsgBox(AddPeriod(GetExceptionMessage), mbCriticalError, MB_OK, IDOK);
+        Result := False;
+      end;
+    finally
+      DownloadPage.Hide;
+    end;
+  end else
+    Result := True;
+end;
+function VCRedistNeedsInstall: Boolean;
+var
+  Major: Cardinal;
+begin
+  Result := True;
+  if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Major', Major) then
+    Result := (Major < 14);
+end;
diff --git a/test/widget_test.dart b/test/widget_test.dart
new file mode 100644
index 0000000..87bf2e8
--- /dev/null
+++ b/test/widget_test.dart
@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:google_photos_album_searcher/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyApp());
+
+    // Verify that our counter starts at 0.
+    expect(find.text('0'), findsOneWidget);
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}
diff --git a/web/android-chrome-144x144.png b/web/android-chrome-144x144.png
deleted file mode 100644
index 48fecd7..0000000
Binary files a/web/android-chrome-144x144.png and /dev/null differ
diff --git a/web/android-chrome-192x192.png b/web/android-chrome-192x192.png
deleted file mode 100644
index 5b989a0..0000000
Binary files a/web/android-chrome-192x192.png and /dev/null differ
diff --git a/web/android-chrome-256x256.png b/web/android-chrome-256x256.png
deleted file mode 100644
index a8a936c..0000000
Binary files a/web/android-chrome-256x256.png and /dev/null differ
diff --git a/web/android-chrome-36x36.png b/web/android-chrome-36x36.png
deleted file mode 100644
index ae1ebba..0000000
Binary files a/web/android-chrome-36x36.png and /dev/null differ
diff --git a/web/android-chrome-384x384.png b/web/android-chrome-384x384.png
deleted file mode 100644
index 6c3029b..0000000
Binary files a/web/android-chrome-384x384.png and /dev/null differ
diff --git a/web/android-chrome-48x48.png b/web/android-chrome-48x48.png
deleted file mode 100644
index 8d0c32b..0000000
Binary files a/web/android-chrome-48x48.png and /dev/null differ
diff --git a/web/android-chrome-512x512.png b/web/android-chrome-512x512.png
deleted file mode 100644
index 700e0b7..0000000
Binary files a/web/android-chrome-512x512.png and /dev/null differ
diff --git a/web/android-chrome-72x72.png b/web/android-chrome-72x72.png
deleted file mode 100644
index b8b6165..0000000
Binary files a/web/android-chrome-72x72.png and /dev/null differ
diff --git a/web/android-chrome-96x96.png b/web/android-chrome-96x96.png
deleted file mode 100644
index d6d062b..0000000
Binary files a/web/android-chrome-96x96.png and /dev/null differ
diff --git a/web/apple-touch-icon-114x114.png b/web/apple-touch-icon-114x114.png
deleted file mode 100644
index 90f8a2f..0000000
Binary files a/web/apple-touch-icon-114x114.png and /dev/null differ
diff --git a/web/apple-touch-icon-120x120.png b/web/apple-touch-icon-120x120.png
deleted file mode 100644
index cab6b75..0000000
Binary files a/web/apple-touch-icon-120x120.png and /dev/null differ
diff --git a/web/apple-touch-icon-144x144.png b/web/apple-touch-icon-144x144.png
deleted file mode 100644
index 29e7a5e..0000000
Binary files a/web/apple-touch-icon-144x144.png and /dev/null differ
diff --git a/web/apple-touch-icon-152x152.png b/web/apple-touch-icon-152x152.png
deleted file mode 100644
index 6e65a7b..0000000
Binary files a/web/apple-touch-icon-152x152.png and /dev/null differ
diff --git a/web/apple-touch-icon-180x180.png b/web/apple-touch-icon-180x180.png
deleted file mode 100644
index b35ec26..0000000
Binary files a/web/apple-touch-icon-180x180.png and /dev/null differ
diff --git a/web/apple-touch-icon-57x57.png b/web/apple-touch-icon-57x57.png
deleted file mode 100644
index 60b8271..0000000
Binary files a/web/apple-touch-icon-57x57.png and /dev/null differ
diff --git a/web/apple-touch-icon-60x60.png b/web/apple-touch-icon-60x60.png
deleted file mode 100644
index f98f408..0000000
Binary files a/web/apple-touch-icon-60x60.png and /dev/null differ
diff --git a/web/apple-touch-icon-72x72.png b/web/apple-touch-icon-72x72.png
deleted file mode 100644
index 892c5d1..0000000
Binary files a/web/apple-touch-icon-72x72.png and /dev/null differ
diff --git a/web/apple-touch-icon-76x76.png b/web/apple-touch-icon-76x76.png
deleted file mode 100644
index c021646..0000000
Binary files a/web/apple-touch-icon-76x76.png and /dev/null differ
diff --git a/web/apple-touch-icon.png b/web/apple-touch-icon.png
index 466f721..7103a63 100644
Binary files a/web/apple-touch-icon.png and b/web/apple-touch-icon.png differ
diff --git a/web/browserconfig.xml b/web/browserconfig.xml
deleted file mode 100644
index e595ac0..0000000
--- a/web/browserconfig.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square70x70logo src="/mstile-70x70.png"/>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <square310x310logo src="/mstile-310x310.png"/>
-            <wide310x150logo src="/mstile-310x150.png"/>
-            <TileColor>#f44336</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/web/favicon-16x16.png b/web/favicon-16x16.png
deleted file mode 100644
index c403993..0000000
Binary files a/web/favicon-16x16.png and /dev/null differ
diff --git a/web/favicon-32x32.png b/web/favicon-32x32.png
deleted file mode 100644
index b1cf3c5..0000000
Binary files a/web/favicon-32x32.png and /dev/null differ
diff --git a/web/favicon.ico b/web/favicon.ico
index 6ba43dc..9e814b3 100644
Binary files a/web/favicon.ico and b/web/favicon.ico differ
diff --git a/web/firebase-config.js.gpg b/web/firebase-config.js.gpg
deleted file mode 100644
index e2bb9fc..0000000
Binary files a/web/firebase-config.js.gpg and /dev/null differ
diff --git a/web/icon-192-maskable.png b/web/icon-192-maskable.png
new file mode 100644
index 0000000..763ef65
Binary files /dev/null and b/web/icon-192-maskable.png differ
diff --git a/web/icon-192.png b/web/icon-192.png
new file mode 100644
index 0000000..d35c752
Binary files /dev/null and b/web/icon-192.png differ
diff --git a/web/icon-512-maskable.png b/web/icon-512-maskable.png
new file mode 100644
index 0000000..c5bc9e1
Binary files /dev/null and b/web/icon-512-maskable.png differ
diff --git a/web/icon-512.png b/web/icon-512.png
new file mode 100644
index 0000000..a5608c1
Binary files /dev/null and b/web/icon-512.png differ
diff --git a/web/index.html b/web/index.html
index 4560bc0..eab1470 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
   <!--
     If you are serving your web app in a path other than the root, change the
@@ -8,105 +8,31 @@
     The path provided below has to start and end with a slash "/" in order for
     it to work correctly.
 
-    Fore more details:
+    For more details:
     * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
   -->
-  <base href="/">
+  <base href="$FLUTTER_BASE_HREF">
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="Album Searcher for Google Photos gives you an enhanced search experience for shared albums.">
+  <meta name="description" content="Please note that Album Searcher for Google Photos is unofficial and not endorsed by Google.">
 
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-  <link rel="manifest" href="/manifest.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#f44336">
-  <meta name="msapplication-TileColor" content="#f44336">
-  <meta name="msapplication-TileImage" content="/mstile-144x144.png">
-  <meta name="theme-color" content="#f44336">
+  <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="Album Searcher for Google Photos">
+  <link rel="apple-touch-icon" href="/apple-touch-icon.png">
+
+  <!-- Favicon -->
+  <link rel="icon" href="/favicon.ico"/>
 
   <title>Album Searcher for Google Photos</title>
+  <link rel="manifest" href="/manifest.json">
 </head>
 <body>
-  <script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-app.js"></script>
-  <script src="https://www.gstatic.com/firebasejs/7.20.0/firebase-analytics.js"></script>
-
-  <script type="module">
-    import { firebaseConfig } from './firebase-config.js';
-
-    firebase.initializeApp(firebaseConfig);
-  </script>
-
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
-  <script>
-    var serviceWorkerVersion = null;
-    var scriptLoaded = false;
-    function loadMainDartJs() {
-      if (scriptLoaded) {
-        return;
-      }
-      scriptLoaded = true;
-      var scriptTag = document.createElement('script');
-      scriptTag.src = 'main.dart.js';
-      scriptTag.type = 'application/javascript';
-      document.body.append(scriptTag);
-    }
-
-    if ('serviceWorker' in navigator) {
-      // Service workers are supported. Use them.
-      window.addEventListener('load', function () {
-        // Wait for registration to finish before dropping the <script> tag.
-        // Otherwise, the browser will load the script multiple times,
-        // potentially different versions.
-        var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
-        navigator.serviceWorker.register(serviceWorkerUrl)
-          .then((reg) => {
-            function waitForActivation(serviceWorker) {
-              serviceWorker.addEventListener('statechange', () => {
-                if (serviceWorker.state == 'activated') {
-                  console.log('Installed new service worker.');
-                  loadMainDartJs();
-                }
-              });
-            }
-            if (!reg.active && (reg.installing || reg.waiting)) {
-              // No active web worker and we have installed or are installing
-              // one for the first time. Simply wait for it to activate.
-              waitForActivation(reg.installing ?? reg.waiting);
-            } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
-              // When the app updates the serviceWorkerVersion changes, so we
-              // need to ask the service worker to update.
-              console.log('New service worker available.');
-              reg.update();
-              waitForActivation(reg.installing);
-            } else {
-              // Existing service worker is still good.
-              console.log('Loading app from service worker.');
-              loadMainDartJs();
-            }
-          });
-
-        // If service worker doesn't succeed in a reasonable amount of time,
-        // fallback to plaint <script> tag.
-        setTimeout(() => {
-          if (!scriptLoaded) {
-            console.warn(
-              'Failed to load app from service worker. Falling back to plain <script> tag.',
-            );
-            loadMainDartJs();
-          }
-        }, 4000);
-      });
-    } else {
-      // Service workers not supported. Just drop the <script> tag.
-      loadMainDartJs();
-    }
-  </script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>
diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644
index 0000000..f5bf2d9
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,34 @@
+{
+    "name": "Album Searcher for Google Photos",
+    "short_name": "Album Searcher for Google Photos",
+    "start_url": ".",
+    "display": "standalone",
+    "theme_color": "#ea4335",
+    "description": "Please note that Album Searcher for Google Photos is unofficial and not endorsed by Google.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icon-192-maskable.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icon-512-maskable.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}
diff --git a/web/manifest.webmanifest b/web/manifest.webmanifest
deleted file mode 100644
index 247e50d..0000000
--- a/web/manifest.webmanifest
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "name": "Album Searcher for Google Photos",
-    "short_name": "Album Searcher for Google Photos",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#f44336",
-    "theme_color": "#f44336",
-    "description": "Album Searcher for Google Photos gives you an enhanced search experience for shared albums.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "/android-chrome-36x36.png",
-            "sizes": "36x36",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-48x48.png",
-            "sizes": "48x48",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-72x72.png",
-            "sizes": "72x72",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-96x96.png",
-            "sizes": "96x96",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-144x144.png",
-            "sizes": "144x144",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-256x256.png",
-            "sizes": "256x256",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ]
-}
diff --git a/web/mstile-144x144.png b/web/mstile-144x144.png
deleted file mode 100644
index 3950789..0000000
Binary files a/web/mstile-144x144.png and /dev/null differ
diff --git a/web/mstile-150x150.png b/web/mstile-150x150.png
deleted file mode 100644
index 6245b0f..0000000
Binary files a/web/mstile-150x150.png and /dev/null differ
diff --git a/web/mstile-310x150.png b/web/mstile-310x150.png
deleted file mode 100644
index 03b1f4b..0000000
Binary files a/web/mstile-310x150.png and /dev/null differ
diff --git a/web/mstile-310x310.png b/web/mstile-310x310.png
deleted file mode 100644
index 216f576..0000000
Binary files a/web/mstile-310x310.png and /dev/null differ
diff --git a/web/mstile-70x70.png b/web/mstile-70x70.png
deleted file mode 100644
index 3a246d9..0000000
Binary files a/web/mstile-70x70.png and /dev/null differ
diff --git a/web/oauth2redirect.html b/web/oauth2redirect.html
deleted file mode 100644
index b7ff038..0000000
--- a/web/oauth2redirect.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Authentication Complete</title>
-</head>
-<body>
-<p>This window can be closed now.</p>
-<script>window.opener.postMessage(window.location.href, '*');</script>
-</body>
-</html>
diff --git a/web/privacy.html b/web/privacy.html
deleted file mode 100644
index a1e9463..0000000
--- a/web/privacy.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Privacy Policy</title>
-</head>
-<body>
-<h1>Privacy Policy</h1>
-<p>Album Searcher for Google Photos has been created by Thomas Clark. This privacy policy will explain how Thomas Clark uses the personal data they collect from you when you use Album Searcher for Google Photos.</p>
-<h2>What data does Thomas Clark collect?</h2>
-<p>Thomas Clark collects the following data:</p>
-<ul>
-  <li>Anonymous usage data.</li>
-</ul>
-<h2>How does Thomas Clark collect your data?</h2>
-<p>You directly provide Thomas Clark with most of the data they collect. They collect data and process data when you:</p>
-<ul>
-  <li>Use or view Album Searcher for Google Photos via your browser's cookies.</li>
-</ul>
-<p>Thomas Clark may also receive your data indirectly from the following sources:</p>
-<ul>
-  <li>Google when you sign-in to Album Searcher for Google Photos using your Google Account.</li>
-</ul>
-<h2>How will Thomas Clark use your data?</h2>
-<p>Thomas Clark collects your data so that they can:</p>
-<ul>
-  <li>Continuously improve Album Searcher for Google Photos.</li>
-</ul>
-<p>If you agree, Thomas Clark may share your data with the following third parties:</p>
-<ul>
-  <li>Google.</li>
-</ul>
-<h2>How does Thomas Clark store your data?</h2>
-<p>Thomas Clark does not store your data, however Google may store your anonymous usage data.</p>
-<h2>Marketing</h2>
-<p>Thomas Clark will never send you information about products and services that they think you might like.</p>
-<h2>What are your data protection rights?</h2>
-<p>Thomas Clark would like to make sure you are fully aware of all of your data protection rights. Every user is entitled to the following:</p>
-<p><strong>The right to access</strong> – You have the right to request Thomas Clark for copies of your personal data. They may charge you a small fee for this service.</p>
-<p><strong>The right to rectification</strong> – You have the right to request that Thomas Clark correct any information you believe is inaccurate. You also have the right to request Thomas Clark to complete the information you believe is incomplete.</p>
-<p><strong>The right to erasure</strong> – You have the right to request that Thomas Clark erase your personal data, under certain conditions.</p>
-<p><strong>The right to restrict processing</strong> – You have the right to request that Thomas Clark restrict the processing of your personal data, under certain conditions.</p>
-<p><strong>The right to object to processing</strong> – You have the right to object to Thomas Clark's processing of your personal data, under certain conditions.</p>
-<p><strong>The right to data portability</strong> – You have the right to request that Thomas Clark transfer the data that they have collected to another organization, or directly to you, under certain conditions.</p>
-<h2>Cookies</h2>
-<p>Cookies are text files placed on your computer to collect standard internet log information and visitor behavior information. When you visit Album Searcher for Google Photos, Thomas Clark may collect information from you automatically through cookies or similar technology.</p>
-<h2>How does Thomas Clark use cookies?</h2>
-<p>Thomas Clark uses cookies in a range of ways to improve your experience on Album Searcher for Google Photos, including:</p>
-<ul>
-  <li>Keeping you signed-in to Album Searcher for Google Photos.</li>
-  <li>Understanding how you use Album Searcher for Google Photos.</li>
-</ul>
-<h2>What types of cookies does Thomas Clark use?</h2>
-<p>There are a number of different types of cookies, however, Album Searcher for Google Photos uses:</p>
-<ul>
-  <li>Functionality cookies so that Thomas Clark recognizes you on Album Searcher for Google Photos and remembers your previously selected preferences. These could include what language you prefer and location you are in.</li>
-  <li>Analytics cookies to collect information about your visit to Album Searcher for Google Photos, the content you viewed, the links you followed and information about your browser, device, and your IP address.</li>
-</ul>
-<h2>How to manage cookies</h2>
-<p>You can set your browser not to accept cookies, however, in a few cases, some of Album Searcher for Google Photos' features may not function as a result.</p>
-<h2>Privacy policies of other applications</h2>
-<p>Album Searcher for Google Photos contains links to other applications. This privacy policy applies only to Album Searcher for Google Photos, so if you click on a link to another application, you should read their privacy policy.</p>
-<h2>Changes to this privacy policy</h2>
-<p>Thomas Clark keeps this privacy policy under regular review and places any updates on this page. This privacy policy was last updated on 22 March 2021.</p>
-<h2>How to contact Thomas Clark</h2>
-<p>If you have any questions about this privacy policy, the data Thomas Clark holds on you, or you would like to exercise one of your data protection rights, please do not hesitate to contact Thomas Clark at their email: <a href="mailto:tnc1997@virginmedia.com">tnc1997@virginmedia.com</a>.</p>
-<h2>How to contact the appropriate authority</h2>
-<p>Should you wish to report a complaint or if you feel that Thomas Clark has not addressed your concern in a satisfactory manner, you may contact the Information Commissioner's Office at their website: <a href="https://ico.org.uk">ico.org.uk</a>.</p>
-</body>
-</html>
diff --git a/web/safari-pinned-tab.svg b/web/safari-pinned-tab.svg
deleted file mode 100644
index 1078846..0000000
--- a/web/safari-pinned-tab.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M4405 6412 c-464 -49 -847 -306 -1052 -707 -62 -122 -94 -218 -129
--390 -12 -64 -16 -295 -5 -371 19 -134 21 -146 57 -253 177 -533 666 -892
-1219 -895 251 -2 406 33 616 138 l106 53 259 -254 c142 -140 345 -339 450
--444 106 -104 195 -189 198 -189 4 0 97 90 207 200 l201 200 -419 421 c-230
-232 -432 435 -450 451 l-32 30 19 31 c81 137 146 318 165 457 3 25 8 57 11 73
-13 63 7 255 -12 367 -41 254 -169 504 -353 690 -125 126 -210 188 -365 264
--121 61 -230 94 -401 122 -37 6 -249 11 -290 6z m341 -617 c99 -31 188 -83
-270 -158 257 -236 307 -629 117 -926 -106 -165 -303 -296 -493 -327 -64 -10
--209 -7 -261 6 -24 6 -54 13 -67 16 -12 2 -48 16 -80 30 -276 122 -446 390
--437 686 2 51 5 102 8 113 33 134 65 208 130 297 184 256 507 361 813 263z"/>
-<path d="M1109 5829 c-233 -25 -427 -183 -501 -409 l-22 -65 -1 -2120 c-1
--1716 1 -2132 11 -2185 42 -208 206 -382 419 -446 57 -17 164 -18 2195 -18
-l2135 -1 68 22 c199 63 353 224 403 423 15 57 17 152 19 785 1 542 -2 725 -11
-740 -6 11 -174 183 -374 382 l-362 362 -40 -15 c-54 -19 -226 -54 -308 -62
--87 -9 -380 -8 -455 1 -425 54 -840 263 -1131 570 -83 87 -224 267 -224 285 0
-6 -4 12 -8 14 -5 2 -31 44 -58 93 -257 467 -307 998 -144 1510 18 55 37 106
-43 113 5 7 7 15 3 19 -8 8 -1582 10 -1657 2z m3071 -2944 c127 -170 242 -323
-254 -340 13 -16 69 -91 125 -165 55 -74 109 -146 120 -160 10 -14 118 -158
-239 -320 122 -162 225 -299 229 -305 38 -45 95 -126 91 -130 -6 -6 -4059 -7
--4065 -1 -2 2 2 10 9 17 7 8 218 277 468 599 250 322 473 609 496 638 l43 52
-362 -435 c346 -415 364 -435 380 -418 9 10 146 185 304 388 298 384 330 425
-355 455 8 10 47 60 85 110 39 51 108 140 154 199 46 58 89 114 95 123 6 10 14
-14 17 10 4 -4 111 -146 239 -317z"/>
-</g>
-</svg>
diff --git a/web/terms.html b/web/terms.html
deleted file mode 100644
index eddbedd..0000000
--- a/web/terms.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Terms of Service</title>
-</head>
-<body>
-<h1>Terms of Service</h1>
-<p>Album Searcher for Google Photos has been created by Thomas Clark. This page explains Album Searcher for Google Photos' terms of service. You must agree to these to use Album Searcher for Google Photos.</p>
-<h2>Using Album Searcher for Google Photos</h2>
-<p>You agree to use Album Searcher for Google Photos only for lawful purposes. You must also use it in a way that does not infringe the rights of, or restrict or inhibit the use and enjoyment of, this application by anyone else.</p>
-<p>Thomas Clark does not give any guarantees or warranties about the accuracy or completeness of any content. Thomas Clark is not liable for any loss or damage that may come from your use of this application.</p>
-<h2>Linking to Album Searcher for Google Photos</h2>
-<p>Thomas Clark welcomes and encourages other applications to link to Album Searcher for Google Photos.</p>
-<h2>Linking from Album Searcher for Google Photos</h2>
-<p>Album Searcher for Google Photos may link to applications that are managed by third parties. Thomas Clark does not have any control over the content on these applications.</p>
-<p>Thomas Clark is not responsible for:</p>
-<ul>
-  <li>The protection of any information you give to these applications.</li>
-  <li>Any loss or damage that may come from your use of these applications.</li>
-</ul>
-<p>You agree to release Thomas Clark from any claims or disputes that may come from using these applications.</p>
-<p>You should read the terms of service and privacy policy that relate to these applications before you use them.</p>
-<h2>Information about you</h2>
-<p>Thomas Clark collects information about you in accordance with Album Searcher for Google Photos' <a href="/privacy.html">privacy policy</a>. By using Album Searcher for Google Photos, you agree to Thomas Clark collecting this information and confirm that any data you provide is accurate.</p>
-<h2>Virus protection</h2>
-<p>Thomas Clark makes every effort to check and test Album Searcher for Google Photos for viruses at every stage of production. You must make sure that the way you use Album Searcher for Google Photos does not expose you to the risk of viruses or other forms of interference which can damage your computer system.</p>
-<p>Thomas Clark is not responsible for any loss or damage to your data or computer system that might happen when you use Album Searcher for Google Photos.</p>
-<h2>Hacking and other offences</h2>
-<p>When using Album Searcher for Google Photos, you must not introduce any material that is malicious or harmful in any way.</p>
-<p>You must not try to gain unauthorised access to Album Searcher for Google Photos in any way.</p>
-<p>You must not attack Album Searcher for Google Photos in any way.</p>
-<p>Thomas Clark will report any attacks or attempts to gain unauthorised access to the relevant law enforcement authorities and share information about you with them.</p>
-<h2>Governing law</h2>
-<p>These terms of service are governed by and construed in accordance with the laws of the United Kingdom.</p>
-<p>Any dispute you have which relates to these terms of service, or your use of Album Searcher for Google Photos (whether it be contractual or non-contractual), will be subject to the exclusive jurisdiction of the courts of the United Kingdom.</p>
-<p>Thomas Clark is not liable for any failure to comply with these terms of service because of circumstances beyond their reasonable control.</p>
-<p>Thomas Clark might decide not to exercise or enforce any right available to them under these terms of service. They can always decide to exercise or enforce that right at a later date.</p>
-<p>If any of these terms of service are held to be unenforceable or illegal for any reason, the remaining terms of service will still apply.</p>
-<h2>Changes to these terms of service</h2>
-<p>Please check these terms of service regularly. Thomas Clark can update them at any time without notice. These terms of service were last updated on 22 March 2021.</p>
-</body>
-</html>
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index 33c1bc9..b0fd8d8 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -1,13 +1,16 @@
-cmake_minimum_required(VERSION 3.15)
-project(album_searcher_for_google_photos LANGUAGES CXX)
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.14)
+project(google_photos_album_searcher LANGUAGES CXX)
 
-set(BINARY_NAME "album_searcher_for_google_photos")
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "google_photos_album_searcher")
 
-cmake_policy(SET CMP0063 NEW)
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(VERSION 3.14...3.25)
 
-set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
-
-# Configure build options.
+# Define build configuration option.
 get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if(IS_MULTICONFIG)
   set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
@@ -20,7 +23,7 @@ else()
       "Debug" "Profile" "Release")
   endif()
 endif()
-
+# Define settings for the Profile build mode.
 set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
 set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
 set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
@@ -30,6 +33,10 @@ set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
 add_definitions(-DUNICODE -D_UNICODE)
 
 # Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
 function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_features(${TARGET} PUBLIC cxx_std_17)
   target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100")
@@ -38,14 +45,14 @@ function(APPLY_STANDARD_SETTINGS TARGET)
   target_compile_definitions(${TARGET} PRIVATE "$<$<CONFIG:Debug>:_DEBUG>")
 endfunction()
 
-set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
-
 # Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
 add_subdirectory(${FLUTTER_MANAGED_DIR})
 
-# Application build
+# Application build; see runner/CMakeLists.txt.
 add_subdirectory("runner")
 
+
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.
 include(flutter/generated_plugins.cmake)
@@ -80,6 +87,12 @@ if(PLUGIN_BUNDLED_LIBRARIES)
     COMPONENT Runtime)
 endif()
 
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+   COMPONENT Runtime)
+
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
 set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
index b02c548..903f489 100644
--- a/windows/flutter/CMakeLists.txt
+++ b/windows/flutter/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.15)
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.14)
 
 set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
 
@@ -9,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake)
 # https://github.com/flutter/flutter/issues/57146.
 set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper")
 
+# Set fallback configurations for older versions of the flutter tool.
+if (NOT DEFINED FLUTTER_TARGET_PLATFORM)
+  set(FLUTTER_TARGET_PLATFORM "windows-x64")
+endif()
+
 # === Flutter Library ===
 set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll")
 
@@ -91,7 +97,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E env
     ${FLUTTER_TOOL_ENVIRONMENT}
     "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat"
-      windows-x64 $<CONFIG>
+      ${FLUTTER_TARGET_PLATFORM} $<CONFIG>
   VERBATIM
 )
 add_custom_target(flutter_assemble DEPENDS
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index d9fdd53..ec8e8d4 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -6,9 +6,12 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_windows/url_launcher_plugin.h>
+#include <firebase_core/firebase_core_plugin_c_api.h>
+#include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
-  UrlLauncherPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("UrlLauncherPlugin"));
+  FirebaseCorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
+  UrlLauncherWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index 411af46..02d26c3 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -3,9 +3,13 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  firebase_core
   url_launcher_windows
 )
 
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
 set(PLUGIN_BUNDLED_LIBRARIES)
 
 foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -14,3 +18,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
   list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
   list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
 endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt
index 977e38b..394917c 100644
--- a/windows/runner/CMakeLists.txt
+++ b/windows/runner/CMakeLists.txt
@@ -1,18 +1,40 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.14)
 project(runner LANGUAGES CXX)
 
+# Define the application target. To change its name, change BINARY_NAME in the
+# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
+# work.
+#
+# Any new source files that you add to the application should be added here.
 add_executable(${BINARY_NAME} WIN32
   "flutter_window.cpp"
   "main.cpp"
-  "run_loop.cpp"
   "utils.cpp"
   "win32_window.cpp"
   "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
   "Runner.rc"
   "runner.exe.manifest"
 )
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
 apply_standard_settings(${BINARY_NAME})
+
+# Add preprocessor definitions for the build version.
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
+target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
+
+# Disable Windows macros that collide with C++ standard library functions.
 target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
+
+# Add dependency libraries and include directories. Add any application-specific
+# dependencies here.
 target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
+target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib")
 target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}")
+
+# Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
index 9d57576..be3ad17 100644
--- a/windows/runner/Runner.rc
+++ b/windows/runner/Runner.rc
@@ -60,14 +60,14 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif
@@ -90,11 +90,11 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "Thomas Clark" "\0"
-            VALUE "FileDescription", "Album Searcher for Google Photos gives you an enhanced search experience for shared albums." "\0"
+            VALUE "FileDescription", "google_photos_album_searcher" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "Album Searcher for Google Photos" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2021 Thomas Clark. All rights reserved." "\0"
-            VALUE "OriginalFilename", "album_searcher_for_google_photos.exe" "\0"
+            VALUE "InternalName", "google_photos_album_searcher" "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 Thomas Clark. All rights reserved." "\0"
+            VALUE "OriginalFilename", "google_photos_album_searcher.exe" "\0"
             VALUE "ProductName", "Album Searcher for Google Photos" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp
index c422723..955ee30 100644
--- a/windows/runner/flutter_window.cpp
+++ b/windows/runner/flutter_window.cpp
@@ -4,9 +4,8 @@
 
 #include "flutter/generated_plugin_registrant.h"
 
-FlutterWindow::FlutterWindow(RunLoop* run_loop,
-                             const flutter::DartProject& project)
-    : run_loop_(run_loop), project_(project) {}
+FlutterWindow::FlutterWindow(const flutter::DartProject& project)
+    : project_(project) {}
 
 FlutterWindow::~FlutterWindow() {}
 
@@ -26,14 +25,22 @@ bool FlutterWindow::OnCreate() {
     return false;
   }
   RegisterPlugins(flutter_controller_->engine());
-  run_loop_->RegisterFlutterInstance(flutter_controller_->engine());
   SetChildContent(flutter_controller_->view()->GetNativeWindow());
+
+  flutter_controller_->engine()->SetNextFrameCallback([&]() {
+    this->Show();
+  });
+
+  // Flutter can complete the first frame before the "show window" callback is
+  // registered. The following call ensures a frame is pending to ensure the
+  // window is shown. It is a no-op if the first frame hasn't completed yet.
+  flutter_controller_->ForceRedraw();
+
   return true;
 }
 
 void FlutterWindow::OnDestroy() {
   if (flutter_controller_) {
-    run_loop_->UnregisterFlutterInstance(flutter_controller_->engine());
     flutter_controller_ = nullptr;
   }
 
@@ -44,7 +51,7 @@ LRESULT
 FlutterWindow::MessageHandler(HWND hwnd, UINT const message,
                               WPARAM const wparam,
                               LPARAM const lparam) noexcept {
-  // Give Flutter, including plugins, an opporutunity to handle window messages.
+  // Give Flutter, including plugins, an opportunity to handle window messages.
   if (flutter_controller_) {
     std::optional<LRESULT> result =
         flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam,
diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h
index b663ddd..6da0652 100644
--- a/windows/runner/flutter_window.h
+++ b/windows/runner/flutter_window.h
@@ -6,16 +6,13 @@
 
 #include <memory>
 
-#include "run_loop.h"
 #include "win32_window.h"
 
 // A window that does nothing but host a Flutter view.
 class FlutterWindow : public Win32Window {
  public:
-  // Creates a new FlutterWindow driven by the |run_loop|, hosting a
-  // Flutter view running |project|.
-  explicit FlutterWindow(RunLoop* run_loop,
-                         const flutter::DartProject& project);
+  // Creates a new FlutterWindow hosting a Flutter view running |project|.
+  explicit FlutterWindow(const flutter::DartProject& project);
   virtual ~FlutterWindow();
 
  protected:
@@ -26,9 +23,6 @@ class FlutterWindow : public Win32Window {
                          LPARAM const lparam) noexcept override;
 
  private:
-  // The run loop driving events for this window.
-  RunLoop* run_loop_;
-
   // The project to run.
   flutter::DartProject project_;
 
diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp
index 94880cd..75f4a4e 100644
--- a/windows/runner/main.cpp
+++ b/windows/runner/main.cpp
@@ -3,7 +3,6 @@
 #include <windows.h>
 
 #include "flutter_window.h"
-#include "run_loop.h"
 #include "utils.h"
 
 int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
@@ -18,8 +17,6 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   // plugins.
   ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);
 
-  RunLoop run_loop;
-
   flutter::DartProject project(L"data");
 
   std::vector<std::string> command_line_arguments =
@@ -27,15 +24,19 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
 
   project.set_dart_entrypoint_arguments(std::move(command_line_arguments));
 
-  FlutterWindow window(&run_loop, project);
+  FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
   Win32Window::Size size(1280, 720);
-  if (!window.CreateAndShow(L"Album Searcher for Google Photos", origin, size)) {
+  if (!window.Create(L"Album Searcher for Google Photos", origin, size)) {
     return EXIT_FAILURE;
   }
   window.SetQuitOnClose(true);
 
-  run_loop.Run();
+  ::MSG msg;
+  while (::GetMessage(&msg, nullptr, 0, 0)) {
+    ::TranslateMessage(&msg);
+    ::DispatchMessage(&msg);
+  }
 
   ::CoUninitialize();
   return EXIT_SUCCESS;
diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico
index 62d9bfb..ef046a8 100644
Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ
diff --git a/windows/runner/run_loop.cpp b/windows/runner/run_loop.cpp
deleted file mode 100644
index 2d6636a..0000000
--- a/windows/runner/run_loop.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include "run_loop.h"
-
-#include <windows.h>
-
-#include <algorithm>
-
-RunLoop::RunLoop() {}
-
-RunLoop::~RunLoop() {}
-
-void RunLoop::Run() {
-  bool keep_running = true;
-  TimePoint next_flutter_event_time = TimePoint::clock::now();
-  while (keep_running) {
-    std::chrono::nanoseconds wait_duration =
-        std::max(std::chrono::nanoseconds(0),
-                 next_flutter_event_time - TimePoint::clock::now());
-    ::MsgWaitForMultipleObjects(
-        0, nullptr, FALSE, static_cast<DWORD>(wait_duration.count() / 1000),
-        QS_ALLINPUT);
-    bool processed_events = false;
-    MSG message;
-    // All pending Windows messages must be processed; MsgWaitForMultipleObjects
-    // won't return again for items left in the queue after PeekMessage.
-    while (::PeekMessage(&message, nullptr, 0, 0, PM_REMOVE)) {
-      processed_events = true;
-      if (message.message == WM_QUIT) {
-        keep_running = false;
-        break;
-      }
-      ::TranslateMessage(&message);
-      ::DispatchMessage(&message);
-      // Allow Flutter to process messages each time a Windows message is
-      // processed, to prevent starvation.
-      next_flutter_event_time =
-          std::min(next_flutter_event_time, ProcessFlutterMessages());
-    }
-    // If the PeekMessage loop didn't run, process Flutter messages.
-    if (!processed_events) {
-      next_flutter_event_time =
-          std::min(next_flutter_event_time, ProcessFlutterMessages());
-    }
-  }
-}
-
-void RunLoop::RegisterFlutterInstance(
-    flutter::FlutterEngine* flutter_instance) {
-  flutter_instances_.insert(flutter_instance);
-}
-
-void RunLoop::UnregisterFlutterInstance(
-    flutter::FlutterEngine* flutter_instance) {
-  flutter_instances_.erase(flutter_instance);
-}
-
-RunLoop::TimePoint RunLoop::ProcessFlutterMessages() {
-  TimePoint next_event_time = TimePoint::max();
-  for (auto instance : flutter_instances_) {
-    std::chrono::nanoseconds wait_duration = instance->ProcessMessages();
-    if (wait_duration != std::chrono::nanoseconds::max()) {
-      next_event_time =
-          std::min(next_event_time, TimePoint::clock::now() + wait_duration);
-    }
-  }
-  return next_event_time;
-}
diff --git a/windows/runner/run_loop.h b/windows/runner/run_loop.h
deleted file mode 100644
index 000d362..0000000
--- a/windows/runner/run_loop.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef RUNNER_RUN_LOOP_H_
-#define RUNNER_RUN_LOOP_H_
-
-#include <flutter/flutter_engine.h>
-
-#include <chrono>
-#include <set>
-
-// A runloop that will service events for Flutter instances as well
-// as native messages.
-class RunLoop {
- public:
-  RunLoop();
-  ~RunLoop();
-
-  // Prevent copying
-  RunLoop(RunLoop const&) = delete;
-  RunLoop& operator=(RunLoop const&) = delete;
-
-  // Runs the run loop until the application quits.
-  void Run();
-
-  // Registers the given Flutter instance for event servicing.
-  void RegisterFlutterInstance(
-      flutter::FlutterEngine* flutter_instance);
-
-  // Unregisters the given Flutter instance from event servicing.
-  void UnregisterFlutterInstance(
-      flutter::FlutterEngine* flutter_instance);
-
- private:
-  using TimePoint = std::chrono::steady_clock::time_point;
-
-  // Processes all currently pending messages for registered Flutter instances.
-  TimePoint ProcessFlutterMessages();
-
-  std::set<flutter::FlutterEngine*> flutter_instances_;
-};
-
-#endif  // RUNNER_RUN_LOOP_H_
diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest
index c977c4a..a42ea76 100644
--- a/windows/runner/runner.exe.manifest
+++ b/windows/runner/runner.exe.manifest
@@ -7,7 +7,7 @@
   </application>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
-      <!-- Windows 10 -->
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
       <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp
index d19bdbb..3a0b465 100644
--- a/windows/runner/utils.cpp
+++ b/windows/runner/utils.cpp
@@ -45,18 +45,19 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) {
   if (utf16_string == nullptr) {
     return std::string();
   }
-  int target_length = ::WideCharToMultiByte(
+  unsigned int target_length = ::WideCharToMultiByte(
       CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
-      -1, nullptr, 0, nullptr, nullptr);
-  if (target_length == 0) {
-    return std::string();
-  }
+      -1, nullptr, 0, nullptr, nullptr)
+    -1; // remove the trailing null character
+  int input_length = (int)wcslen(utf16_string);
   std::string utf8_string;
+  if (target_length == 0 || target_length > utf8_string.max_size()) {
+    return utf8_string;
+  }
   utf8_string.resize(target_length);
   int converted_length = ::WideCharToMultiByte(
       CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string,
-      -1, utf8_string.data(),
-      target_length, nullptr, nullptr);
+      input_length, utf8_string.data(), target_length, nullptr, nullptr);
   if (converted_length == 0) {
     return std::string();
   }
diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp
index c10f08d..60608d0 100644
--- a/windows/runner/win32_window.cpp
+++ b/windows/runner/win32_window.cpp
@@ -1,13 +1,31 @@
 #include "win32_window.h"
 
+#include <dwmapi.h>
 #include <flutter_windows.h>
 
 #include "resource.h"
 
 namespace {
 
+/// Window attribute that enables dark mode window decorations.
+///
+/// Redefined in case the developer's machine has a Windows SDK older than
+/// version 10.0.22000.0.
+/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute
+#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
+#define DWMWA_USE_IMMERSIVE_DARK_MODE 20
+#endif
+
 constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW";
 
+/// Registry key for app theme preference.
+///
+/// A value of 0 indicates apps should use dark mode. A non-zero or missing
+/// value indicates apps should use light mode.
+constexpr const wchar_t kGetPreferredBrightnessRegKey[] =
+  L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
+constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme";
+
 // The number of Win32Window objects that currently exist.
 static int g_active_window_count = 0;
 
@@ -31,8 +49,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) {
           GetProcAddress(user32_module, "EnableNonClientDpiScaling"));
   if (enable_non_client_dpi_scaling != nullptr) {
     enable_non_client_dpi_scaling(hwnd);
-    FreeLibrary(user32_module);
   }
+  FreeLibrary(user32_module);
 }
 
 }  // namespace
@@ -42,7 +60,7 @@ class WindowClassRegistrar {
  public:
   ~WindowClassRegistrar() = default;
 
-  // Returns the singleton registar instance.
+  // Returns the singleton registrar instance.
   static WindowClassRegistrar* GetInstance() {
     if (!instance_) {
       instance_ = new WindowClassRegistrar();
@@ -102,9 +120,9 @@ Win32Window::~Win32Window() {
   Destroy();
 }
 
-bool Win32Window::CreateAndShow(const std::wstring& title,
-                                const Point& origin,
-                                const Size& size) {
+bool Win32Window::Create(const std::wstring& title,
+                         const Point& origin,
+                         const Size& size) {
   Destroy();
 
   const wchar_t* window_class =
@@ -117,7 +135,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title,
   double scale_factor = dpi / 96.0;
 
   HWND window = CreateWindow(
-      window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE,
+      window_class, title.c_str(), WS_OVERLAPPEDWINDOW,
       Scale(origin.x, scale_factor), Scale(origin.y, scale_factor),
       Scale(size.width, scale_factor), Scale(size.height, scale_factor),
       nullptr, nullptr, GetModuleHandle(nullptr), this);
@@ -126,9 +144,15 @@ bool Win32Window::CreateAndShow(const std::wstring& title,
     return false;
   }
 
+  UpdateTheme(window);
+
   return OnCreate();
 }
 
+bool Win32Window::Show() {
+  return ShowWindow(window_handle_, SW_SHOWNORMAL);
+}
+
 // static
 LRESULT CALLBACK Win32Window::WndProc(HWND const window,
                                       UINT const message,
@@ -188,6 +212,10 @@ Win32Window::MessageHandler(HWND hwnd,
         SetFocus(child_content_);
       }
       return 0;
+
+    case WM_DWMCOLORIZATIONCOLORCHANGED:
+      UpdateTheme(hwnd);
+      return 0;
   }
 
   return DefWindowProc(window_handle_, message, wparam, lparam);
@@ -243,3 +271,18 @@ bool Win32Window::OnCreate() {
 void Win32Window::OnDestroy() {
   // No-op; provided for subclasses.
 }
+
+void Win32Window::UpdateTheme(HWND const window) {
+  DWORD light_mode;
+  DWORD light_mode_size = sizeof(light_mode);
+  LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey,
+                               kGetPreferredBrightnessRegValue,
+                               RRF_RT_REG_DWORD, nullptr, &light_mode,
+                               &light_mode_size);
+
+  if (result == ERROR_SUCCESS) {
+    BOOL enable_dark_mode = light_mode == 0;
+    DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE,
+                          &enable_dark_mode, sizeof(enable_dark_mode));
+  }
+}
diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h
index 17ba431..e901dde 100644
--- a/windows/runner/win32_window.h
+++ b/windows/runner/win32_window.h
@@ -28,15 +28,16 @@ class Win32Window {
   Win32Window();
   virtual ~Win32Window();
 
-  // Creates and shows a win32 window with |title| and position and size using
+  // Creates a win32 window with |title| that is positioned and sized using
   // |origin| and |size|. New windows are created on the default monitor. Window
   // sizes are specified to the OS in physical pixels, hence to ensure a
-  // consistent size to will treat the width height passed in to this function
-  // as logical pixels and scale to appropriate for the default monitor. Returns
-  // true if the window was created successfully.
-  bool CreateAndShow(const std::wstring& title,
-                     const Point& origin,
-                     const Size& size);
+  // consistent size this function will scale the inputted width and height as
+  // as appropriate for the default monitor. The window is invisible until
+  // |Show| is called. Returns true if the window was created successfully.
+  bool Create(const std::wstring& title, const Point& origin, const Size& size);
+
+  // Show the current window. Returns true if the window was successfully shown.
+  bool Show();
 
   // Release OS resources associated with window.
   void Destroy();
@@ -76,7 +77,7 @@ class Win32Window {
   // OS callback called by message pump. Handles the WM_NCCREATE message which
   // is passed when the non-client area is being created and enables automatic
   // non-client DPI scaling so that the non-client area automatically
-  // responsponds to changes in DPI. All other messages are handled by
+  // responds to changes in DPI. All other messages are handled by
   // MessageHandler.
   static LRESULT CALLBACK WndProc(HWND const window,
                                   UINT const message,
@@ -86,6 +87,9 @@ class Win32Window {
   // Retrieves a class instance pointer for |window|
   static Win32Window* GetThisFromHandle(HWND const window) noexcept;
 
+  // Update the window frame's theme to match the system theme.
+  static void UpdateTheme(HWND const window);
+
   bool quit_on_close_ = false;
 
   // window handle for top level window.