diff --git a/README.md b/README.md
index 3fc3125..949a30f 100644
--- a/README.md
+++ b/README.md
@@ -24,11 +24,6 @@ To recognize the Kana syllabary without difficulty is a costly task. While there
     <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Logo" width=200
   </a>
   
-## Built With
-
-* [Flutter](https://flutter.dev/) - SDK
-* [Android Studio](https://developer.android.com/studio) - IDE
-
 ## Author
 
 * **Aeri** - *Project Nihonoari* - [aeri](https://github.com/aeri)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index af2e5e1..c448a5e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,3 +1,9 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-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')
 if (flutterVersionCode == null) {
     flutterVersionCode = '1'
@@ -21,11 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -47,7 +43,7 @@ android {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     lintOptions {
         disable 'InvalidPackage'
@@ -55,8 +51,8 @@ android {
 
     defaultConfig {
         applicationId "com.LAPARCELA.nihonoari"
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion flutter.minSdkVersion
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -84,8 +80,4 @@ android {
 
 flutter {
     source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
+}
\ No newline at end of file
diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png
deleted file mode 100644
index 99c11db..0000000
Binary files a/android/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
index 78237b5..223031f 100644
--- a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
+++ b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -17,7 +17,7 @@ public final class GeneratedPluginRegistrant {
   public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
-    } catch(Exception e) {
+    } catch (Exception e) {
       Log.e(TAG, "Error registering plugin shared_preferences_android, io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin", e);
     }
   }
diff --git a/android/app/src/main/res/drawable-night/ic_launcher_background.xml b/android/app/src/main/res/drawable-night/ic_launcher_background.xml
new file mode 100644
index 0000000..faa68e3
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/ic_launcher_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+    android:height="108dp"
+    android:width="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+</vector>
diff --git a/android/app/src/main/res/drawable-night/launch_background.xml b/android/app/src/main/res/drawable-night/launch_background.xml
new file mode 100644
index 0000000..b9fd5ab
--- /dev/null
+++ b/android/app/src/main/res/drawable-night/launch_background.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/black" />
+
+    <!-- You can insert your own image assets here -->
+</layer-list>
diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
index 2408e30..faa68e3 100644
--- a/android/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,70 +5,5 @@
     android:viewportHeight="108"
     android:viewportWidth="108"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#008577"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+
 </vector>
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 329f275..b24d0fb 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/darker_gray" />
+    <item android:drawable="@android:color/white" />
 
     <!-- You can insert your own image assets here -->
 </layer-list>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 00fa441..f9b1bb2 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
diff --git a/android/app/src/main/splash.png b/android/app/src/main/splash.png
deleted file mode 100644
index 1d92bc2..0000000
Binary files a/android/app/src/main/splash.png and /dev/null differ
diff --git a/android/build.gradle b/android/build.gradle
index a23b5f1..b42eb3a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,17 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.6.10'
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -25,6 +11,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..689c275 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,25 @@
-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.2.1" apply false
+    id "org.jetbrains.kotlin.android" version "1.6.10" apply false
+}
+
+include ":app"
\ No newline at end of file
diff --git a/fastlane/metadata/android/de/changelogs/13.txt b/fastlane/metadata/android/de/changelogs/13.txt
new file mode 100644
index 0000000..b4406f4
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/13.txt
@@ -0,0 +1 @@
+* Neues helles Thema und dunkles Thema hinzugefügt, das für OLED-Displays optimiert ist
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
new file mode 100644
index 0000000..eca8eb0
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1 @@
+* Added a new light theme and dark theme optimized for OLED displays
\ No newline at end of file
diff --git a/fastlane/metadata/android/es/changelogs/13.txt b/fastlane/metadata/android/es/changelogs/13.txt
new file mode 100644
index 0000000..91348bb
--- /dev/null
+++ b/fastlane/metadata/android/es/changelogs/13.txt
@@ -0,0 +1 @@
+* Se añade un nuevo tema claro y se optimiza el tema oscuro para pantallas OLED
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr/changelogs/13.txt b/fastlane/metadata/android/fr/changelogs/13.txt
new file mode 100644
index 0000000..2ea0c6a
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/13.txt
@@ -0,0 +1 @@
+* Ajout d'un nouveau thème clair et d'un thème foncé optimisé pour les écrans OLED
\ No newline at end of file
diff --git a/lib/Models/GlobalKanas.dart b/lib/Models/GlobalKanas.dart
index 8c2504c..a94058e 100644
--- a/lib/Models/GlobalKanas.dart
+++ b/lib/Models/GlobalKanas.dart
@@ -1,7 +1,6 @@
 import 'package:nihonoari/Models/Transliteration.dart';
 
-
 class GlobalKanas {
   static Map<String, List<Transliteration>> hiraganaMap = {};
   static Map<String, List<Transliteration>> katakanaMap = {};
-}
\ No newline at end of file
+}
diff --git a/lib/Models/KanaList.dart b/lib/Models/KanaList.dart
index 2abe7f4..519a19a 100644
--- a/lib/Models/KanaList.dart
+++ b/lib/Models/KanaList.dart
@@ -1,3 +1,21 @@
+/*
+    Copyright (C) 2020 Naval Alcalá
+
+    This file is part of Nihonoari.
+
+    Nihonoari is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Nihonoari is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Nihonoari.  If not, see <https://www.gnu.org/licenses/>.
+ */
 class KanaList {
   static Map hiragana = {
     "あ い う え お" : [
diff --git a/lib/Models/Transliteration.dart b/lib/Models/Transliteration.dart
index 264a16b..e7058cf 100644
--- a/lib/Models/Transliteration.dart
+++ b/lib/Models/Transliteration.dart
@@ -1,12 +1,32 @@
-// To parse this JSON data, do
-//
-//     final kanas = kanasFromJson(jsonString);
+/*
+    Copyright (C) 2020 Naval Alcalá
+
+    This file is part of Nihonoari.
+
+    Nihonoari is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Nihonoari is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Nihonoari.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 import 'dart:convert';
 
-Map<String, List<Transliteration>> kanasFromJson(String str) => Map.from(json.decode(str)).map((k, v) => MapEntry<String, List<Transliteration>>(k, List<Transliteration>.from(v.map((x) => Transliteration.fromJson(x)))));
+Map<String, List<Transliteration>> kanasFromJson(String str) => Map.from(
+        json.decode(str))
+    .map((k, v) => MapEntry<String, List<Transliteration>>(k,
+        List<Transliteration>.from(v.map((x) => Transliteration.fromJson(x)))));
 
-String kanasToJson(Map<String, List<Transliteration>> data) => json.encode(Map.from(data).map((k, v) => MapEntry<String, dynamic>(k, List<dynamic>.from(v.map((x) => x.toJson())))));
+String kanasToJson(Map<String, List<Transliteration>> data) =>
+    json.encode(Map.from(data).map((k, v) => MapEntry<String, dynamic>(
+        k, List<dynamic>.from(v.map((x) => x.toJson())))));
 
 class Transliteration {
   Transliteration({
@@ -17,18 +37,29 @@ class Transliteration {
   System? system;
   String? value;
 
-  factory Transliteration.fromJson(Map<String, dynamic> json) => Transliteration(
-    system: systemValues.map[json["system"]],
-    value: json["value"],
-  );
+  factory Transliteration.fromJson(Map<String, dynamic> json) =>
+      Transliteration(
+        system: systemValues.map[json["system"]],
+        value: json["value"],
+      );
 
   Map<String, dynamic> toJson() => {
-    "system": systemValues.reverse[system],
-    "value": value,
-  };
+        "system": systemValues.reverse[system],
+        "value": value,
+      };
 }
 
-enum System { Romaji, Bondarenko, Nakazawa, Fedorishyn, Gojuon, Kovalenko, Ruble, DibrovaOdinets, Polivanov }
+enum System {
+  Romaji,
+  Bondarenko,
+  Nakazawa,
+  Fedorishyn,
+  Gojuon,
+  Kovalenko,
+  Ruble,
+  DibrovaOdinets,
+  Polivanov
+}
 
 final systemValues = EnumValues({
   "Бондаренко": System.Bondarenko,
@@ -49,7 +80,7 @@ class EnumValues<T> {
   EnumValues(this.map);
 
   Map<T, String> get reverse {
-      reverseMap = map.map((k, v) => new MapEntry(v, k));
+    reverseMap = map.map((k, v) => new MapEntry(v, k));
     return reverseMap;
   }
 }
diff --git a/lib/Question.dart b/lib/Question.dart
index 02e8763..65cba4f 100644
--- a/lib/Question.dart
+++ b/lib/Question.dart
@@ -17,8 +17,7 @@
     along with Nihonoari.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-class Question{
-
+class Question {
   String question = "";
   List<String?> answer = [];
   String type = "";
diff --git a/lib/UI.Utils/IconCreator.dart b/lib/UI.Utils/IconCreator.dart
index bfdefd6..8a067b0 100644
--- a/lib/UI.Utils/IconCreator.dart
+++ b/lib/UI.Utils/IconCreator.dart
@@ -1,7 +1,25 @@
+/*
+    Copyright (C) 2020 Naval Alcalá
+
+    This file is part of Nihonoari.
+
+    Nihonoari is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Nihonoari is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Nihonoari.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 import 'package:flutter/material.dart';
 
 class IconCreator extends StatelessWidget {
-
   IconCreator(this.icon);
 
   final String icon;
@@ -10,7 +28,7 @@ class IconCreator extends StatelessWidget {
   Widget build(BuildContext context) {
     return new Container(
       decoration: new BoxDecoration(
-        color: Colors.white,
+        color: Theme.of(context).colorScheme.secondary,
         borderRadius: new BorderRadius.circular(4.0),
       ),
       padding: EdgeInsets.symmetric(vertical: 1, horizontal: 1),
@@ -25,10 +43,10 @@ class IconCreator extends StatelessWidget {
             fontSize: 16.0,
             fontFamily: "MP1P_MEDIUM",
             fontStyle: FontStyle.normal,
-            color: Colors.black,
+            color: Theme.of(context).colorScheme.onSecondary,
           ),
         ),
       ),
     );
   }
-}
\ No newline at end of file
+}
diff --git a/lib/main.dart b/lib/main.dart
index d0ca60e..8a56585 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -66,6 +66,59 @@ Future<void> main() async {
       GlobalCupertinoLocalizations.delegate,
       DefaultWidgetsLocalizations.delegate,
     ],
+    darkTheme: ThemeData(
+      useMaterial3: true,
+      // Define the default brightness and colors.
+      colorScheme: ColorScheme(
+        primary: Colors.red,
+        secondary: Colors.white,
+        error: Colors.red,
+        onBackground: Colors.white,
+        onError: Colors.red,
+        onPrimary: Colors.white,
+        onSecondary: Colors.black,
+        onSurface: Colors.white,
+        surface: Colors.black,
+        tertiary: Colors.grey,
+        background: Colors.black,
+        brightness: Brightness.dark,
+      ),
+      dialogTheme: const DialogTheme(
+        backgroundColor: Colors.black,
+        surfaceTintColor: Colors.grey,
+      ),
+
+      unselectedWidgetColor: Colors.white,
+      textTheme: TextTheme(
+        displayLarge: const TextStyle(
+          fontSize: 72,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    ),
+    theme: ThemeData(
+      useMaterial3: true,
+      colorScheme: ColorScheme(
+        primary: Colors.redAccent,
+        secondary: Color(0xff011627),
+        error: Colors.redAccent,
+        onBackground: Color(0xff011627),
+        onError: Colors.redAccent,
+        onPrimary: Color(0xfffffbff),
+        onSecondary: Color(0xfffffbff),
+        onSurface: Color(0xff011627),
+        surface: Color(0xfffffbff),
+        tertiary: Colors.grey,
+        background: Color(0xfffffbff),
+        brightness: Brightness.light,
+      ),
+      dialogTheme: const DialogTheme(
+        backgroundColor: Color(0xfffffbff),
+        surfaceTintColor: Colors.transparent,
+      ),
+      /* dark theme settings */
+    ),
+    themeMode: ThemeMode.system,
     home: new MyApp(),
   ));
 }
@@ -92,33 +145,30 @@ class _HiraDialogState extends State<HiraDialog> {
       title: Text(
         AppLocalizations.of(context)!.translate('main_hset')!,
         style: TextStyle(
-          color: Colors.white,
+          color: Theme.of(context).colorScheme.secondary,
         ),
       ),
-      backgroundColor: Colors.black,
       content: Container(
         width: double.maxFinite,
-        child: new Theme(
-          data: ThemeData(unselectedWidgetColor: Colors.white),
-          child: new ListView(
-            children: _hirasol.keys.map((String key) {
-              return new CheckboxListTile(
-                title: new Text(
-                  key,
-                  style: TextStyle(
-                    color: Colors.white,
-                  ),
+        child: new ListView(
+          children: _hirasol.keys.map((String key) {
+            return new CheckboxListTile(
+              title: new Text(
+                key,
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondary,
                 ),
-                activeColor: Colors.red,
-                value: _hirasol[key],
-                onChanged: (bool? value) {
-                  setState(() {
-                    _hirasol[key] = value;
-                  });
-                },
-              );
-            }).toList(),
-          ),
+              ),
+              checkColor: Theme.of(context).colorScheme.onPrimary,
+              activeColor: Theme.of(context).colorScheme.primary,
+              value: _hirasol[key],
+              onChanged: (bool? value) {
+                setState(() {
+                  _hirasol[key] = value;
+                });
+              },
+            );
+          }).toList(),
         ),
       ),
       actions: <Widget>[
@@ -126,7 +176,7 @@ class _HiraDialogState extends State<HiraDialog> {
         new TextButton(
           child: new Icon(
             Icons.done,
-            color: Colors.red,
+            color: Theme.of(context).colorScheme.primary,
           ),
           onPressed: () {
             Navigator.of(context).pop();
@@ -141,36 +191,33 @@ class _KataDialogState extends State<KataDialog> {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      backgroundColor: Colors.black,
       title: Text(
         AppLocalizations.of(context)!.translate('main_kset')!,
         style: TextStyle(
-          color: Colors.white,
+          color: Theme.of(context).colorScheme.secondary,
         ),
       ),
       content: Container(
         width: double.maxFinite,
-        child: Theme(
-          data: ThemeData(unselectedWidgetColor: Colors.white),
-          child: new ListView(
-            children: _katasol.keys.map((String key) {
-              return new CheckboxListTile(
-                title: new Text(
-                  key,
-                  style: TextStyle(
-                    color: Colors.white,
-                  ),
+        child: new ListView(
+          children: _katasol.keys.map((String key) {
+            return new CheckboxListTile(
+              title: new Text(
+                key,
+                style: TextStyle(
+                  color: Theme.of(context).colorScheme.secondary,
                 ),
-                value: _katasol[key],
-                activeColor: Colors.red,
-                onChanged: (bool? value) {
-                  setState(() {
-                    _katasol[key] = value;
-                  });
-                },
-              );
-            }).toList(),
-          ),
+              ),
+              checkColor: Theme.of(context).colorScheme.onPrimary,
+              activeColor: Theme.of(context).colorScheme.primary,
+              value: _katasol[key],
+              onChanged: (bool? value) {
+                setState(() {
+                  _katasol[key] = value;
+                });
+              },
+            );
+          }).toList(),
         ),
       ),
       actions: <Widget>[
@@ -178,7 +225,7 @@ class _KataDialogState extends State<KataDialog> {
         new TextButton(
           child: new Icon(
             Icons.done,
-            color: Colors.red,
+            color: Theme.of(context).colorScheme.primary,
           ),
           onPressed: () {
             Navigator.of(context).pop();
@@ -202,9 +249,9 @@ class _State extends State<MyApp> {
   }
 
   Future<Null> readData() async {
-    await SharedKanaPreferences.init();
-    _hirasol = json.decode(SharedKanaPreferences.getHiraganaSet());
-    _katasol = json.decode(SharedKanaPreferences.getKatakanaSet());
+    await AppPreferences.init();
+    _hirasol = json.decode(AppPreferences.getHiraganaSet());
+    _katasol = json.decode(AppPreferences.getKatakanaSet());
   }
 
   bool _isButtonDisabled = true;
@@ -218,39 +265,9 @@ class _State extends State<MyApp> {
     _isButtonDisabled = _katakana || _hiragana ? false : true;
   }
 
-  void _showLicense() async {
-    String data = await loadAsset("assets/LICENSES.txt");
-    // flutter defined function
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        // return object of type Dialog
-        return AlertDialog(
-          title: Text("Licenses"),
-          content: new SingleChildScrollView(
-            child: Text(data),
-          ),
-          actions: <Widget>[
-            // usually buttons at the bottom of the dialog
-            new TextButton(
-              child: new Icon(
-                Icons.done,
-                color: Colors.red,
-              ),
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-            ),
-          ],
-        );
-      },
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     return new Scaffold(
-      backgroundColor: Colors.grey.shade900,
       //hit Ctrl+space in intellij to know what are the options you can use in flutter widgets
       body: new Container(
         padding: new EdgeInsets.all(32.0),
@@ -271,7 +288,7 @@ class _State extends State<MyApp> {
                             style: TextStyle(
                               fontFamily: 'MP1P_LIGHT',
                               fontSize: 25.0,
-                              color: Colors.white,
+                              color: Theme.of(context).colorScheme.secondary,
                             ),
                             children: <TextSpan>[
                               TextSpan(
@@ -289,11 +306,16 @@ class _State extends State<MyApp> {
                                 .translate('main_licenses'),
                             recognizer: TapGestureRecognizer()
                               ..onTap = () {
-                                _showLicense();
+                                showLicensePage(
+                                  context: context,
+                                  applicationName: 'Nihonoari',
+                                  applicationLegalese:
+                                      'Copyright (C) 2020  Naval Alcalá',
+                                );
                               },
                             style: TextStyle(
                               fontSize: 15.0,
-                              color: Colors.grey,
+                              color: Theme.of(context).colorScheme.tertiary,
                             ),
                           ),
                         ),
@@ -302,124 +324,117 @@ class _State extends State<MyApp> {
                   )),
               Expanded(
                 flex: 1,
-                child: Theme(
-                  data: ThemeData(unselectedWidgetColor: Colors.white),
-                  child: new Column(children: <Widget>[
-                    new CheckboxListTile(
-                      value: _hiragana,
-                      onChanged: (value) async {
-                        if (value!) {
-                          await showDialog(
-                            context: context,
-                            builder: (context) {
-                              return HiraDialog();
-                            },
-                          );
-                        }
-                        if (!_hirasol.containsValue(true)) {
-                          _hiraganaChanged(false);
-                        } else {
-                          _hiraganaChanged(value);
-                        }
-                        __isButtonDisabledChanged();
-                      },
-                      title: new Text(
-                        'Hiragana',
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                child: new Column(children: <Widget>[
+                  new CheckboxListTile(
+                    checkColor: Theme.of(context).colorScheme.onPrimary,
+                    activeColor: Theme.of(context).colorScheme.primary,
+                    value: _hiragana,
+                    onChanged: (value) async {
+                      if (value!) {
+                        await showDialog(
+                          context: context,
+                          builder: (context) {
+                            return HiraDialog();
+                          },
+                        );
+                      }
+                      if (!_hirasol.containsValue(true)) {
+                        _hiraganaChanged(false);
+                      } else {
+                        _hiraganaChanged(value);
+                      }
+                      __isButtonDisabledChanged();
+                    },
+                    title: new Text(
+                      'Hiragana',
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      controlAffinity: ListTileControlAffinity.leading,
-                      subtitle: new Text(
-                        AppLocalizations.of(context)!
-                            .translate('main_hiragana')!,
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                    ),
+                    controlAffinity: ListTileControlAffinity.leading,
+                    subtitle: new Text(
+                      AppLocalizations.of(context)!.translate('main_hiragana')!,
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      secondary: new IconCreator("あ"),
-                      activeColor: Colors.red,
                     ),
-                    new CheckboxListTile(
-                      value: _katakana,
-                      onChanged: (value) async {
-                        if (value!) {
-                          await showDialog(
-                            context: context,
-                            builder: (context) {
-                              return KataDialog();
-                            },
-                          );
-                        }
+                    secondary: new IconCreator("あ"),
+                  ),
+                  new CheckboxListTile(
+                    value: _katakana,
+                    checkColor: Theme.of(context).colorScheme.onPrimary,
+                    activeColor: Theme.of(context).colorScheme.primary,
+                    onChanged: (value) async {
+                      if (value!) {
+                        await showDialog(
+                          context: context,
+                          builder: (context) {
+                            return KataDialog();
+                          },
+                        );
+                      }
 
-                        if (!_katasol.containsValue(true)) {
-                          _katakanaChanged(false);
-                        } else {
-                          _katakanaChanged(value);
-                        }
-                        __isButtonDisabledChanged();
-                      },
-                      title: new Text(
-                        'Katakana',
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                      if (!_katasol.containsValue(true)) {
+                        _katakanaChanged(false);
+                      } else {
+                        _katakanaChanged(value);
+                      }
+                      __isButtonDisabledChanged();
+                    },
+                    title: new Text(
+                      'Katakana',
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      controlAffinity: ListTileControlAffinity.leading,
-                      subtitle: new Text(
-                        AppLocalizations.of(context)!
-                            .translate('main_katakana')!,
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                    ),
+                    controlAffinity: ListTileControlAffinity.leading,
+                    subtitle: new Text(
+                      AppLocalizations.of(context)!.translate('main_katakana')!,
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      secondary: new IconCreator("ア"),
-                      activeColor: Colors.red,
                     ),
-                    SwitchListTile(
-                      title: new Text(
-                        AppLocalizations.of(context)!.translate('main_rset')!,
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                    secondary: new IconCreator("ア"),
+                  ),
+                  SwitchListTile(
+                    title: new Text(
+                      AppLocalizations.of(context)!.translate('main_rset')!,
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      subtitle: new Text(
-                        AppLocalizations.of(context)!
-                            .translate('main_reverse')!,
-                        style: TextStyle(
-                          color: Colors.white,
-                        ),
+                    ),
+                    subtitle: new Text(
+                      AppLocalizations.of(context)!.translate('main_reverse')!,
+                      style: TextStyle(
+                        color: Theme.of(context).colorScheme.secondary,
                       ),
-                      controlAffinity: ListTileControlAffinity.leading,
-                      value: _reverse,
-                      activeColor: Colors.red,
-                      inactiveThumbColor: Colors.white,
-                      inactiveTrackColor: Colors.black,
-                      onChanged: (bool value) {
-                        setState(() {
-                          _reverse = value;
-                        });
-                      },
-                      secondary: new IconCreator("A"),
-                    )
-                  ]),
-                ),
+                    ),
+                    controlAffinity: ListTileControlAffinity.leading,
+                    value: _reverse,
+                    activeColor: Theme.of(context).colorScheme.onPrimary,
+                    activeTrackColor: Theme.of(context).colorScheme.primary,
+                    inactiveThumbColor: Theme.of(context).colorScheme.secondary,
+                    inactiveTrackColor:
+                        Theme.of(context).colorScheme.background,
+                    onChanged: (bool value) {
+                      setState(() {
+                        _reverse = value;
+                      });
+                    },
+                    secondary: new IconCreator("A"),
+                  )
+                ]),
               ),
               Expanded(
                 flex: 0,
                 child: Center(
                   child: new ElevatedButton(
                     style: ElevatedButton.styleFrom(
-                        minimumSize: Size(100, 50),
-                        textStyle: TextStyle(
-                          color: Colors.white,
-                        ),
-                        padding: const EdgeInsets.all(8.0),
-                        primary: Colors.red,
-                        // background
-                        onPrimary: Colors.white,
-                        // foreground
-                        onSurface: Colors.white),
+                      minimumSize: Size(100, 50),
+                      padding: const EdgeInsets.all(8.0),
+                      backgroundColor: Theme.of(context).colorScheme.primary,
+                      foregroundColor: Theme.of(context).colorScheme.secondary,
+                    ),
                     onPressed: _isButtonDisabled
                         ? null
                         : () {
@@ -434,11 +449,15 @@ class _State extends State<MyApp> {
                                       re: _reverse)),
                             );
                           },
-                    child: new Text(_isButtonDisabled
-                        ? AppLocalizations.of(context)!
-                            .translate('main_select')!
-                        : AppLocalizations.of(context)!
-                            .translate('main_start')!),
+                    child: new Text(
+                      _isButtonDisabled
+                          ? AppLocalizations.of(context)!
+                              .translate('main_select')!
+                          : AppLocalizations.of(context)!
+                              .translate('main_start')!,
+                      style: TextStyle(
+                          color: Theme.of(context).colorScheme.onPrimary),
+                    ),
                   ),
                 ),
               ),
diff --git a/lib/party.dart b/lib/party.dart
index d728fd9..5016e19 100644
--- a/lib/party.dart
+++ b/lib/party.dart
@@ -44,9 +44,23 @@ class Party extends StatefulWidget {
 }
 
 class _Party extends State<Party> {
+  Color? _questionColor;
+
+  FocusNode _focusNode = FocusNode();
+  bool _ignore = false;
+  Timer? t;
+
+  TextEditingController _controller = TextEditingController();
+
+  List<Widget> scoreKeeper = [];
+  int total = 0;
+  int accepted = 0;
+  int rejected = 0;
+  double ratio = 0;
+
   _Party(h, hv, k, kv, re) {
-    SharedKanaPreferences.setHiraganaSet(hv);
-    SharedKanaPreferences.setKatakanaSet(kv);
+    AppPreferences.setHiraganaSet(hv);
+    AppPreferences.setKatakanaSet(kv);
 
     //var loc = WidgetsBinding.instance.window.locales;
     var currentDefaultSystemLocale = Platform.localeName;
@@ -57,12 +71,15 @@ class _Party extends State<Party> {
 
   void showInSnackBar(int control, String result) {
     ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+      backgroundColor: Theme.of(context).colorScheme.primary,
       elevation: 10,
       duration: Duration(milliseconds: control),
       content: Text(
         '${AppLocalizations.of(context)!.translate('quiz_correct')}: $result',
         style: TextStyle(
-            fontSize: 20, color: Colors.white, fontWeight: FontWeight.bold),
+            fontSize: 20,
+            color: Theme.of(context).colorScheme.onPrimary,
+            fontWeight: FontWeight.bold),
         textAlign: TextAlign.center,
       ),
     ));
@@ -72,31 +89,17 @@ class _Party extends State<Party> {
     ScaffoldMessenger.of(context).hideCurrentSnackBar();
   }
 
-  FocusNode _focusNode = FocusNode();
-
-  bool _ignore = false;
-
-  Timer? t;
-
-  Color _result = Colors.white;
-
-  TextEditingController _controller = TextEditingController();
-
-  List<Widget> scoreKeeper = [];
-  int total = 0;
-  int accepted = 0;
-  int rejected = 0;
-  double ratio = 0;
+  @override
+  void dispose() {
+    _focusNode.dispose();
+    if (t != null && t!.isActive) t!.cancel();
+    QuizBrain.clearList();
+    super.dispose();
+  }
 
   @override
   void initState() {
     super.initState();
-
-    _focusNode.addListener(() {
-      if (!_focusNode.hasFocus) {
-        FocusScope.of(context).requestFocus(_focusNode);
-      }
-    });
   }
 
   void _showDialog() async {
@@ -107,11 +110,10 @@ class _Party extends State<Party> {
       builder: (BuildContext context) {
         // return object of type Dialog
         return AlertDialog(
-          backgroundColor: Colors.black,
           title:
               new Text(AppLocalizations.of(context)!.translate('quiz_stats')!,
                   style: TextStyle(
-                    color: Colors.white,
+                    color: Theme.of(context).colorScheme.secondary,
                   )),
           content: new Text(
               "${AppLocalizations.of(context)!.translate('quiz_total')}: $total\n"
@@ -119,14 +121,14 @@ class _Party extends State<Party> {
               "${AppLocalizations.of(context)!.translate('quiz_failed')}: $rejected\n"
               "${AppLocalizations.of(context)!.translate('quiz_rate')}: ${ratio.toStringAsFixed(2)}%",
               style: TextStyle(
-                color: Colors.white,
+                color: Theme.of(context).colorScheme.secondary,
               )),
           actions: <Widget>[
             // usually buttons at the bottom of the dialog
             new TextButton(
               child: new Icon(
                 Icons.done,
-                color: Colors.red,
+                color: Theme.of(context).colorScheme.primary,
               ),
               onPressed: () {
                 Navigator.of(context).pop();
@@ -143,23 +145,22 @@ class _Party extends State<Party> {
     return showDialog(
       context: context,
       builder: (context) => new AlertDialog(
-        backgroundColor: Colors.black,
         title:
             new Text(AppLocalizations.of(context)!.translate('quiz_stoptit')!,
                 style: TextStyle(
-                  color: Colors.white,
+                  color: Theme.of(context).colorScheme.secondary,
                 )),
         content:
             new Text(AppLocalizations.of(context)!.translate('quiz_stopmes')!,
                 style: TextStyle(
-                  color: Colors.white,
+                  color: Theme.of(context).colorScheme.secondary,
                 )),
         actions: <Widget>[
           // usually buttons at the bottom of the dialog
           new TextButton(
             child: new Icon(
               Icons.close,
-              color: Colors.red,
+              color: Theme.of(context).colorScheme.primary,
             ),
             onPressed: () {
               Navigator.of(context).pop(false);
@@ -168,26 +169,38 @@ class _Party extends State<Party> {
           new TextButton(
             child: new Icon(
               Icons.done,
-              color: Colors.red,
+              color: Theme.of(context).colorScheme.primary,
             ),
             onPressed: () {
-              if (t != null && t!.isActive) t!.cancel();
-              QuizBrain.clearList();
               Navigator.of(context).pop(true);
             },
           ),
         ],
       ),
-    ).then((value) => true);
+    ).then((value) {
+      return value ?? false;
+    });
   }
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: _onBackPressed,
+    if (_questionColor == null) {
+      _questionColor = Theme.of(context).colorScheme.secondary;
+    }
+
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (didPop) async {
+        if (didPop) {
+          return;
+        }
+        bool isExit = await _onBackPressed();
+        if (isExit) {
+          Navigator.of(context).pop();
+        }
+      },
       child: new Scaffold(
         key: _scaffoldKey,
-        backgroundColor: Colors.grey.shade900,
         body: SafeArea(
           child: Padding(
             padding: EdgeInsets.symmetric(horizontal: 10.0),
@@ -198,31 +211,30 @@ class _Party extends State<Party> {
                 Expanded(
                     flex: 0,
                     child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                       children: <Widget>[
-                        Expanded(
-                            child: IconButton(
-                                // Use the FontAwesomeIcons class for the IconData
-                                icon: new Icon(FontAwesomeIcons.language,
-                                    color: Colors.white),
-                                onPressed: () {
-                                  FocusScope.of(context)
-                                      .requestFocus(new FocusNode());
-                                  Navigator.push(
-                                    context,
-                                    MaterialPageRoute(
-                                        builder: (context) => BasicGridView()),
-                                  );
-                                })),
-                        Expanded(
-                            child: IconButton(
-                                // Use the FontAwesomeIcons class for the IconData
-                                icon: new Icon(FontAwesomeIcons.chartBar,
-                                    color: Colors.white),
-                                onPressed: () {
-                                  FocusScope.of(context)
-                                      .requestFocus(new FocusNode());
-                                  _showDialog();
-                                })),
+                        IconButton(
+                            // Use the FontAwesomeIcons class for the IconData
+                            icon: new Icon(FontAwesomeIcons.language,
+                                color: Theme.of(context).colorScheme.secondary),
+                            onPressed: () {
+                              FocusScope.of(context)
+                                  .requestFocus(new FocusNode());
+                              Navigator.push(
+                                context,
+                                MaterialPageRoute(
+                                    builder: (context) => BasicGridView()),
+                              );
+                            }),
+                        IconButton(
+                            // Use the FontAwesomeIcons class for the IconData
+                            icon: new Icon(FontAwesomeIcons.chartBar,
+                                color: Theme.of(context).colorScheme.secondary),
+                            onPressed: () {
+                              FocusScope.of(context)
+                                  .requestFocus(new FocusNode());
+                              _showDialog();
+                            }),
                       ],
                     )),
                 Expanded(
@@ -238,7 +250,7 @@ class _Party extends State<Party> {
                           style: TextStyle(
                             fontFamily: 'MP1P_LIGHT',
                             fontSize: 125.0,
-                            color: _result,
+                            color: _questionColor,
                           ),
                         ),
                       ),
@@ -252,11 +264,11 @@ class _Party extends State<Party> {
                   focusNode: _focusNode,
                   autofocus: true,
                   textAlign: TextAlign.center,
-                  cursorColor: Colors.white,
+                  cursorColor: Theme.of(context).colorScheme.secondary,
                   decoration: InputDecoration(
-                      hoverColor: Colors.white,
-                      fillColor: Colors.white,
-                      focusColor: Colors.white,
+                      hoverColor: Theme.of(context).colorScheme.secondary,
+                      fillColor: Theme.of(context).colorScheme.secondary,
+                      focusColor: Theme.of(context).colorScheme.secondary,
                       border: InputBorder.none,
                       hintStyle: TextStyle(color: Colors.grey),
                       hintText: (() {
@@ -275,9 +287,10 @@ class _Party extends State<Party> {
                       })()),
                   style: TextStyle(
                     fontSize: 20,
-                    color: Colors.white,
+                    color: Theme.of(context).colorScheme.secondary,
                   ),
                   onSubmitted: (value) {
+                    FocusScope.of(context).autofocus(_focusNode);
                     if (_ignore || value.length < 1) {
                       return;
                     }
@@ -298,13 +311,13 @@ class _Party extends State<Party> {
                       if (answer.contains(value.toLowerCase())) {
                         control = 500;
                         print("OK");
-                        _result = Colors.green;
+                        _questionColor = Colors.greenAccent;
                         ++accepted;
                         passed = true;
                       } else {
                         control = 2000;
                         print("NO");
-                        _result = Colors.red;
+                        _questionColor = Theme.of(context).colorScheme.primary;
                         ++rejected;
                         showInSnackBar(
                             control, answer.toSet().toList().join(" / "));
@@ -315,7 +328,8 @@ class _Party extends State<Party> {
 
                     t = Timer(Duration(milliseconds: control), () {
                       setState(() {
-                        _result = Colors.white;
+                        _questionColor =
+                            Theme.of(context).colorScheme.secondary;
                         QuizBrain.nextQuestion(passed);
                         _ignore = false;
                       });
diff --git a/lib/preferences.dart b/lib/preferences.dart
index ed3cb29..e5de7cd 100644
--- a/lib/preferences.dart
+++ b/lib/preferences.dart
@@ -19,7 +19,7 @@
 import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:convert';
 
-class SharedKanaPreferences {
+class AppPreferences {
   static Future<SharedPreferences> get _instance async =>
       _prefsInstance ??= await SharedPreferences.getInstance();
   static SharedPreferences? _prefsInstance;
@@ -61,7 +61,7 @@ class SharedKanaPreferences {
   static final String _katasolSet = "katakana";
 
   static String getHiraganaSet() {
-    var hiraganaData = _prefsInstance!.getString(_hirasolSet);
+    var hiraganaData = _prefsInstance?.getString(_hirasolSet);
 
     if (hiraganaData == null) {
       print("EMPTY HIRAGANA");
@@ -77,7 +77,7 @@ class SharedKanaPreferences {
   }
 
   static String getKatakanaSet() {
-    var katakanaData = _prefsInstance!.getString(_katasolSet);
+    var katakanaData = _prefsInstance?.getString(_katasolSet);
 
     if (katakanaData == null) {
       print("EMPTY KATAKANA");
@@ -89,6 +89,6 @@ class SharedKanaPreferences {
   }
 
   static Future<bool> setKatakanaSet(Map<String, dynamic>? value) async {
-    return _prefsInstance!.setString(_katasolSet, json.encode(value));
+    return await _prefsInstance!.setString(_katasolSet, json.encode(value));
   }
 }
diff --git a/lib/table.dart b/lib/table.dart
index 83baf16..ce5b4c3 100644
--- a/lib/table.dart
+++ b/lib/table.dart
@@ -26,7 +26,6 @@ class BasicGridView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      backgroundColor: Colors.grey.shade900,
       body: Center(
         child: Padding(
           padding: const EdgeInsets.all(15.0),
@@ -46,77 +45,66 @@ class BasicGridView extends StatelessWidget {
               _columnContainer("u"),
               _columnContainer("e"),
               _columnContainer("o"),
-
               _columnContainer("a"),
               _buildContainer("a"),
               _buildContainer("i"),
               _buildContainer("u"),
               _buildContainer("e"),
               _buildContainer("o"),
-
               _columnContainer("k"),
               _buildContainer("ka"),
               _buildContainer("ki"),
               _buildContainer("ku"),
               _buildContainer("ke"),
               _buildContainer("ko"),
-
               _columnContainer("s"),
               _buildContainer("sa"),
               _buildContainer("shi"),
               _buildContainer("su"),
               _buildContainer("se"),
               _buildContainer("so"),
-
               _columnContainer("t"),
               _buildContainer("ta"),
               _buildContainer("chi"),
               _buildContainer("tsu"),
               _buildContainer("te"),
               _buildContainer("to"),
-
               _columnContainer("n"),
               _buildContainer("na"),
               _buildContainer("ni"),
               _buildContainer("nu"),
               _buildContainer("ne"),
               _buildContainer("no"),
-
               _columnContainer("h"),
               _buildContainer("ha"),
               _buildContainer("hi"),
               _buildContainer("fu"),
               _buildContainer("he"),
               _buildContainer("ho"),
-
               _columnContainer("m"),
               _buildContainer("ma"),
               _buildContainer("mi"),
               _buildContainer("mu"),
               _buildContainer("me"),
               _buildContainer("mo"),
-
               _columnContainer("y"),
               _buildContainer("ya"),
               _emptyContainer(),
               _buildContainer("yu"),
               _emptyContainer(),
               _buildContainer("yo"),
-
               _columnContainer("r"),
               _buildContainer("ra"),
               _buildContainer("ri"),
               _buildContainer("ru"),
               _buildContainer("re"),
               _buildContainer("ro"),
-
               _columnContainer("w"),
               _buildContainer("wa"),
               _emptyContainer(),
               _emptyContainer(),
               _emptyContainer(),
               _buildContainer("wo"),
-
               _emptyContainer(),
               _buildContainer("n"),
             ],
@@ -172,7 +160,7 @@ class BasicGridView extends StatelessWidget {
           TextSpan(
             text: deep,
             style: TextStyle(
-              color: Colors.deepOrangeAccent,
+              color: Colors.redAccent,
               fontSize: 20,
               fontFamily: "MP1P_MEDIUM",
             ),
diff --git a/pubspec.yaml b/pubspec.yaml
index c26f2de..6b32386 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,39 +1,25 @@
 name: nihonoari
 description: A little Japanese Kana training
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# Read more about versioning at semver.org.
-
-version: 1.7.2+12
+version: 1.8.0+13
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=3.3.4 <4.0.0'
 
 dependencies:
   kana_kit: ^2.0.0
-  font_awesome_flutter: ^9.2.0
-  shared_preferences: ^2.0.12
+  font_awesome_flutter: ^10.7.0
+  shared_preferences: ^2.2.3
   flutter:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
 
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
   fonts:
     - family: MP1P_MEDIUM
@@ -58,38 +44,4 @@ flutter:
     - assets/data/hira.json
     - assets/data/kata.json
 
-  # 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.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #  - images/a_dot_burr.jpeg
-  #  - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.io/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.io/assets-and-images/#from-packages
-
-  # 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
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.io/custom-fonts/#from-packages