diff --git a/.gitmodules b/.gitmodules
index 8cd5c43f..55c34521 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "naplo-plus"]
 	path = refilc_plus
-	url = git@github.com:refilc/naplo-plus.git
+	url = https://git.qwit.cloud/refilc/student-plus.git
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
deleted file mode 100644
index 86624d63..00000000
--- a/.idea/libraries/Dart_Packages.xml
+++ /dev/null
@@ -1,1286 +0,0 @@
-<component name="libraryTable">
-  <library name="Dart Packages" type="DartPackagesLibraryType">
-    <properties>
-      <option name="packageNameToDirsMap">
-        <entry key="animated_background">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/animated_background-2.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="animated_flip_counter">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/animated_flip_counter-0.2.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="animated_list_plus">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/animated_list_plus-0.5.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="animations">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/animations-2.0.7/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="app_group_directory">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/app_group_directory-2.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="archive">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/archive-3.3.7/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="args">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="async">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/async-2.11.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="auto_size_text">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/auto_size_text-3.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="background_fetch">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/background_fetch-1.1.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="boolean_selector">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="characters">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/characters-1.3.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="checked_yaml">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="cli_util">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/cli_util-0.4.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="clock">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/clock-1.1.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="collection">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/collection-1.17.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="confetti">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/confetti-0.6.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="connectivity_plus">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="connectivity_plus_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/connectivity_plus_platform_interface-1.2.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="convert">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/convert-3.1.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="cross_file">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/cross_file-0.3.3+4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="crypto">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/crypto-3.0.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="csslib">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-0.17.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="cupertino_icons">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="dbus">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/dbus-0.7.8/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="device_calendar">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/device_calendar-4.3.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="dropdown_button2">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/dropdown_button2-1.9.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="dynamic_color">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/dynamic_color-1.6.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="elegant_notification">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/elegant_notification-1.10.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="equatable">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/equatable-2.0.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="fake_async">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="ffi">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/ffi-2.0.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="file">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file-6.1.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="file_picker">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.2/lib" />
-              <option value="$USER_HOME$/.pub-cache/git/flutter_file_picker-b49c9beafb8a30b8486eb524e54946453c1b1928//lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="fl_chart">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/fl_chart-0.45.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter">
-          <value>
-            <list>
-              <option value="/opt/flutter/packages/flutter/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_acrylic">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_acrylic-1.1.3/lib" />
-              <option value="$USER_HOME$/.pub-cache/git/flutter_acrylic-a9d5fffe6b91e1e28758c157f03b62ca9daed07a//lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_custom_tabs">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs-1.0.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_custom_tabs_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs_platform_interface-1.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_custom_tabs_web">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs_web-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_displaymode">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_displaymode-0.6.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_expandable_fab">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_expandable_fab-1.8.1/lib" />
-              <option value="$USER_HOME$/.pub-cache/git/flutter_expandable_fab-019fc1fb2c59e6baca5c23a339aa9752ecf99964//lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_feather_icons">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_feather_icons-2.0.0+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_image_compress">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_image_compress-1.1.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_launcher_icons">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_launcher_icons-0.13.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_linkify">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_linkify-5.0.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_lints">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_lints-1.0.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_local_notifications">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-14.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_local_notifications_linux">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications_linux-4.0.0+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_local_notifications_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications_platform_interface-7.0.0+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_localizations">
-          <value>
-            <list>
-              <option value="/opt/flutter/packages/flutter_localizations/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_markdown">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_markdown-0.6.14/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_material_color_picker">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_material_color_picker-1.1.0+2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_native_image">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_image-0.0.6+1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_native_splash">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_native_timezone">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_timezone-2.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_plugin_android_lifecycle">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.15/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_svg">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_svg-1.1.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_test">
-          <value>
-            <list>
-              <option value="/opt/flutter/packages/flutter_test/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="flutter_web_plugins">
-          <value>
-            <list>
-              <option value="/opt/flutter/packages/flutter_web_plugins/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="graphs">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="home_widget">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/home_widget-0.1.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="html">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="http">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/http-0.13.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="http_parser">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="i18n_extension">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/i18n_extension-9.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image-4.0.17/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image_picker">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.7+5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image_picker_android">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+16/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image_picker_for_web">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-2.1.12/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image_picker_ios">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.7+4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="image_picker_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.6.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="intl">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/intl-0.18.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="js">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/js-0.6.7/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="json_annotation">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/json_annotation-4.8.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="linkify">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/linkify-4.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="lints">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.0/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/lints-1.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="live_activities">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/live_activities-1.7.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="lottie">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/lottie-1.4.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="macos_window_utils">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/macos_window_utils-1.1.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="markdown">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/markdown-7.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="matcher">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/matcher-0.12.15/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="material_color_utilities">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="meta">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/meta-1.9.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="mime">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/mime-1.0.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="nested">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/nested-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="nm">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/nm-0.5.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="open_file">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/git/open_file-0ee6d69b5810e066ceb23776cea3716749038669//lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="package_info_plus">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus-4.0.2/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus-3.1.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="package_info_plus_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus_platform_interface-2.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path-1.8.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_drawing">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_drawing-1.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_parsing">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_parsing-1.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.0.15/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider_android">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider_foundation">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider_linux">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="path_provider_windows">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="permission_handler">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler-10.2.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="permission_handler_android">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_android-10.2.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="permission_handler_apple">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_apple-9.0.8/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="permission_handler_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-3.9.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="permission_handler_windows">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_windows-0.1.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="petitparser">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/petitparser-5.4.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="photo_view">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/photo_view-0.14.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="platform">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/platform-3.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="plugin_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="pointycastle">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/pointycastle-3.7.3/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="process">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/process-4.2.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="provider">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/provider-5.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="quick_actions">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions-1.0.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="quick_actions_android">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_android-1.0.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="quick_actions_ios">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_ios-1.0.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="quick_actions_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_platform_interface-1.0.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="rive">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/rive-0.9.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-7.0.2/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-5.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus_linux">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_linux-3.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus_macos">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_macos-3.0.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_platform_interface-3.2.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus_web">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_web-3.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="share_plus_windows">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_windows-4.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sky_engine">
-          <value>
-            <list>
-              <option value="/opt/flutter/bin/cache/pkg/sky_engine/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="source_span">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/source_span-1.9.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sprintf">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sprintf-7.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sqflite">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.2.8+4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sqflite_common">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite_common-2.4.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sqflite_common_ffi">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite_common_ffi-2.2.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="sqlite3">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/sqlite3-1.11.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="stack_trace">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="stream_channel">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="string_scanner">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="synchronized">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/synchronized-3.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="term_glyph">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="test_api">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/test_api-0.5.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="timezone">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="typed_data">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/typed_data-1.3.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="uni_links">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links-0.5.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="uni_links_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links_platform_interface-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="uni_links_web">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links_web-0.1.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="universal_io">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.11/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_android">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.35/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_ios">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_linux">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_macos">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.5/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_platform_interface">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_platform_interface-2.1.2/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_web">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.17/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="url_launcher_windows">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.6/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="uuid">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/uuid-3.0.7/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="vector_math">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="win32">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/win32-5.0.3/lib" />
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/win32-2.7.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="workmanager">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/workmanager-0.5.1/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="wtf_sliding_sheet">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/wtf_sliding_sheet-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="xdg_directories">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/xdg_directories-1.0.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="xml">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/xml-6.3.0/lib" />
-            </list>
-          </value>
-        </entry>
-        <entry key="yaml">
-          <value>
-            <list>
-              <option value="$USER_HOME$/.pub-cache/hosted/pub.dev/yaml-3.1.2/lib" />
-            </list>
-          </value>
-        </entry>
-      </option>
-    </properties>
-    <CLASSES>
-      <root url="file://$USER_HOME$/.pub-cache/git/flutter_acrylic-a9d5fffe6b91e1e28758c157f03b62ca9daed07a//lib" />
-      <root url="file://$USER_HOME$/.pub-cache/git/flutter_expandable_fab-019fc1fb2c59e6baca5c23a339aa9752ecf99964//lib" />
-      <root url="file://$USER_HOME$/.pub-cache/git/flutter_file_picker-b49c9beafb8a30b8486eb524e54946453c1b1928//lib" />
-      <root url="file://$USER_HOME$/.pub-cache/git/open_file-0ee6d69b5810e066ceb23776cea3716749038669//lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/animated_background-2.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/animated_flip_counter-0.2.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/animated_list_plus-0.5.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/animations-2.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/app_group_directory-2.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/archive-3.3.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/args-2.4.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/async-2.11.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/auto_size_text-3.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/background_fetch-1.1.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/characters-1.3.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cli_util-0.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/clock-1.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/collection-1.17.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/confetti-0.6.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/connectivity_plus-4.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/connectivity_plus_platform_interface-1.2.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/convert-3.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cross_file-0.3.3+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/crypto-3.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/csslib-0.17.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/cupertino_icons-1.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/dbus-0.7.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/device_calendar-4.3.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/dropdown_button2-1.9.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/dynamic_color-1.6.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/elegant_notification-1.10.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/equatable-2.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fake_async-1.3.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/ffi-2.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file-6.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/file_picker-5.3.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/fl_chart-0.45.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_acrylic-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs_platform_interface-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_custom_tabs_web-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_displaymode-0.6.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_expandable_fab-1.8.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_feather_icons-2.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_image_compress-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_launcher_icons-0.13.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_linkify-5.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_lints-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_lints-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications-14.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications_linux-4.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_local_notifications_platform_interface-7.0.0+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_markdown-0.6.14/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_material_color_picker-1.1.0+2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_image-0.0.6+1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_splash-2.3.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_native_timezone-2.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.15/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/flutter_svg-1.1.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/graphs-2.3.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/home_widget-0.1.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/html-0.15.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/http-0.13.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/http_parser-4.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/i18n_extension-9.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image-4.0.17/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker-0.8.7+5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_android-0.8.6+16/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_for_web-2.1.12/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_ios-0.8.7+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/image_picker_platform_interface-2.6.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/intl-0.18.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/js-0.6.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/json_annotation-4.8.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/linkify-4.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/lints-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/lints-2.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/live_activities-1.7.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/lottie-1.4.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/macos_window_utils-1.1.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/markdown-7.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/matcher-0.12.15/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/material_color_utilities-0.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/meta-1.9.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/mime-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/nested-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/nm-0.5.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus-3.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus-4.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/package_info_plus_platform_interface-2.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path-1.8.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_drawing-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_parsing-1.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider-2.0.15/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_android-2.0.27/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_foundation-2.2.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_linux-2.1.11/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_platform_interface-2.0.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/path_provider_windows-2.1.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler-10.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_android-10.2.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_apple-9.0.8/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_platform_interface-3.9.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/permission_handler_windows-0.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/petitparser-5.4.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/photo_view-0.14.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/platform-3.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/plugin_platform_interface-2.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/pointycastle-3.7.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/process-4.2.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/provider-5.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions-1.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_android-1.0.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_ios-1.0.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/quick_actions_platform_interface-1.0.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/rive-0.9.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-5.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus-7.0.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_linux-3.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_macos-3.0.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_platform_interface-3.2.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_web-3.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/share_plus_windows-4.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/source_span-1.9.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sprintf-7.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite-2.2.8+4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite_common-2.4.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqflite_common_ffi-2.2.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/sqlite3-1.11.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/synchronized-3.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/test_api-0.5.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/timezone-0.9.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/typed_data-1.3.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links-0.5.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links_platform_interface-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/uni_links_web-0.1.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/universal_io-2.2.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher-6.1.11/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_android-6.0.35/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_ios-6.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_macos-3.0.5/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_platform_interface-2.1.2/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_web-2.0.17/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/url_launcher_windows-3.0.6/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/uuid-3.0.7/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/vector_math-2.1.4/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/win32-2.7.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/win32-5.0.3/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/workmanager-0.5.1/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/wtf_sliding_sheet-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/xdg_directories-1.0.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/xml-6.3.0/lib" />
-      <root url="file://$USER_HOME$/.pub-cache/hosted/pub.dev/yaml-3.1.2/lib" />
-      <root url="file:///opt/flutter/bin/cache/pkg/sky_engine/lib" />
-      <root url="file:///opt/flutter/packages/flutter/lib" />
-      <root url="file:///opt/flutter/packages/flutter_localizations/lib" />
-      <root url="file:///opt/flutter/packages/flutter_test/lib" />
-      <root url="file:///opt/flutter/packages/flutter_web_plugins/lib" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 563d1c42..d7ab9e2e 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,28 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file:///opt/flutter/bin/cache/dart-sdk/lib/web_gl" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/async" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/cli" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/collection" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/concurrent" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/convert" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/core" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/developer" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/ffi" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/html" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/indexed_db" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/io" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/isolate" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/js" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/js_interop" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/js_interop_unsafe" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/js_util" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/math" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/mirrors" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/svg" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/typed_data" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/web_audio" />
+      <root url="file://$USER_HOME$/3D Objects/dart-sdk/lib/web_gl" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index de791dde..c39d7781 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" project-jdk-name="Android API 33, extension level 3 Platform" project-jdk-type="Android SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/naplo.iml b/.idea/naplo.iml
index ab2f4821..d039dc02 100644
--- a/.idea/naplo.iml
+++ b/.idea/naplo.iml
@@ -60,8 +60,21 @@
       <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/build" />
       <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/filcnaplo/linux/flutter/ephemeral/.plugin_symlinks/flutter_acrylic/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc/build" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_kreta_api/build" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_mobile_ui/build" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_plus/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_plus/.pub" />
+      <excludeFolder url="file://$MODULE_DIR$/refilc_plus/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index b2035b95..e2184156 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,9 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/filcnaplo_desktop_ui" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/filcnaplo_kreta_api" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/filcnaplo_mobile_ui" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/filcnaplo_premium" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/refilc_plus" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/refilc/android/app/build.gradle b/refilc/android/app/build.gradle
index ed504f67..1d24c20a 100644
--- a/refilc/android/app/build.gradle
+++ b/refilc/android/app/build.gradle
@@ -120,7 +120,8 @@ android {
 
         release {
             signingConfig signingConfigs.release
-            shrinkResources false
+            shrinkResources true
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/refilc/android/app/proguard-rules.pro b/refilc/android/app/proguard-rules.pro
index 31bcfd1e..00aeccca 100644
--- a/refilc/android/app/proguard-rules.pro
+++ b/refilc/android/app/proguard-rules.pro
@@ -11,4 +11,6 @@
 -dontwarn com.stripe.android.pushProvisioning.PushProvisioningEphemeralKeyProvider
 
 -dontwarn org.joda.convert.FromString
--dontwarn org.joda.convert.ToString
\ No newline at end of file
+-dontwarn org.joda.convert.ToString
+
+#-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
\ No newline at end of file
diff --git a/refilc/android/app/src/main/res/drawable-hdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-hdpi/android12splash.png
index 44270d23..b6c44318 100644
Binary files a/refilc/android/app/src/main/res/drawable-hdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-hdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png
index 9ab61acd..441a9169 100644
Binary files a/refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png and b/refilc/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ
diff --git a/refilc/android/app/src/main/res/drawable-hdpi/splash.png b/refilc/android/app/src/main/res/drawable-hdpi/splash.png
index 44270d23..b6c44318 100644
Binary files a/refilc/android/app/src/main/res/drawable-hdpi/splash.png and b/refilc/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-mdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-mdpi/android12splash.png
index 8bbb6c5e..856f5e04 100644
Binary files a/refilc/android/app/src/main/res/drawable-mdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-mdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png
index 26787bb3..6b1563d9 100644
Binary files a/refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png and b/refilc/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ
diff --git a/refilc/android/app/src/main/res/drawable-mdpi/splash.png b/refilc/android/app/src/main/res/drawable-mdpi/splash.png
index 8bbb6c5e..856f5e04 100644
Binary files a/refilc/android/app/src/main/res/drawable-mdpi/splash.png and b/refilc/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png
index 44270d23..b6c44318 100644
Binary files a/refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-night-hdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png
index 8bbb6c5e..856f5e04 100644
Binary files a/refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-night-mdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png
index f0be66f0..eca10987 100644
Binary files a/refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-night-xhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png
index dff19fd5..b2be096f 100644
Binary files a/refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-night-xxhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png
index 1cfecc9f..5b6058f5 100644
Binary files a/refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-night-xxxhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-v21/background.png b/refilc/android/app/src/main/res/drawable-v21/background.png
index 7b563c85..59a249d6 100644
Binary files a/refilc/android/app/src/main/res/drawable-v21/background.png and b/refilc/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png
index f0be66f0..eca10987 100644
Binary files a/refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-xhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png
index ce3adc94..e41b1c60 100644
Binary files a/refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png and b/refilc/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xhdpi/splash.png
index f0be66f0..eca10987 100644
Binary files a/refilc/android/app/src/main/res/drawable-xhdpi/splash.png and b/refilc/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png
index dff19fd5..b2be096f 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-xxhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png
index 4eb9f084..3f3ae930 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png and b/refilc/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xxhdpi/splash.png
index dff19fd5..b2be096f 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxhdpi/splash.png and b/refilc/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png
index 1cfecc9f..5b6058f5 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png and b/refilc/android/app/src/main/res/drawable-xxxhdpi/android12splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png
index 253bcd0e..1171b3ec 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png and b/refilc/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png b/refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png
index 1cfecc9f..5b6058f5 100644
Binary files a/refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png and b/refilc/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/refilc/android/app/src/main/res/drawable/background.png b/refilc/android/app/src/main/res/drawable/background.png
index 7b563c85..59a249d6 100644
Binary files a/refilc/android/app/src/main/res/drawable/background.png and b/refilc/android/app/src/main/res/drawable/background.png differ
diff --git a/refilc/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/refilc/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 5f349f7f..c79c58a3 100644
--- a/refilc/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/refilc/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,9 @@
 <?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"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
 </adaptive-icon>
diff --git a/refilc/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/refilc/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index e1ea2dae..630f7d94 100644
Binary files a/refilc/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/refilc/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/refilc/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/refilc/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c42f6ebd..c7c3b955 100644
Binary files a/refilc/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/refilc/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/refilc/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/refilc/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index dee0e7bc..f55a4d5e 100644
Binary files a/refilc/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/refilc/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/refilc/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/refilc/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 2b72514b..a8161896 100644
Binary files a/refilc/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/refilc/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/refilc/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/refilc/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index b3783dd0..86054c63 100644
Binary files a/refilc/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/refilc/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/refilc/android/app/src/main/res/values-night-v31/styles.xml b/refilc/android/app/src/main/res/values-night-v31/styles.xml
index 52ac530f..c2f77e1a 100644
--- a/refilc/android/app/src/main/res/values-night-v31/styles.xml
+++ b/refilc/android/app/src/main/res/values-night-v31/styles.xml
@@ -6,7 +6,7 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-        <item name="android:windowSplashScreenBackground">#03112D</item>
+        <item name="android:windowSplashScreenBackground">#7CA021</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/refilc/android/app/src/main/res/values-v31/styles.xml b/refilc/android/app/src/main/res/values-v31/styles.xml
index 302b715f..7a9be1ce 100644
--- a/refilc/android/app/src/main/res/values-v31/styles.xml
+++ b/refilc/android/app/src/main/res/values-v31/styles.xml
@@ -6,7 +6,7 @@
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-        <item name="android:windowSplashScreenBackground">#03112D</item>
+        <item name="android:windowSplashScreenBackground">#7CA021</item>
         <item name="android:windowSplashScreenAnimatedIcon">@drawable/android12splash</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/refilc/android/app/src/main/res/values/colors.xml b/refilc/android/app/src/main/res/values/colors.xml
index f1facef1..bdbdaea6 100644
--- a/refilc/android/app/src/main/res/values/colors.xml
+++ b/refilc/android/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#03112D</color>
+    <color name="ic_launcher_background">#7CA021</color>
 
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
@@ -66,4 +66,4 @@
     <color name="pink_shade300">#FFF06292</color>
     <color name="purple_shade300">#FFBA68C8</color>
     <color name="teal_shade300">#FF22AC9B</color>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/refilc/assets/icons/ic_android.png b/refilc/assets/icons/ic_android.png
index b795beea..63456bc2 100644
Binary files a/refilc/assets/icons/ic_android.png and b/refilc/assets/icons/ic_android.png differ
diff --git a/refilc/assets/icons/ic_android_n.png b/refilc/assets/icons/ic_android_n.png
index b795beea..63456bc2 100644
Binary files a/refilc/assets/icons/ic_android_n.png and b/refilc/assets/icons/ic_android_n.png differ
diff --git a/refilc/assets/icons/ic_launcher_foreground.png b/refilc/assets/icons/ic_launcher_foreground.png
index 08e59633..9a0502b9 100644
Binary files a/refilc/assets/icons/ic_launcher_foreground.png and b/refilc/assets/icons/ic_launcher_foreground.png differ
diff --git a/refilc/assets/icons/ic_rounded.png b/refilc/assets/icons/ic_rounded.png
index 48fa0467..a06e5b99 100644
Binary files a/refilc/assets/icons/ic_rounded.png and b/refilc/assets/icons/ic_rounded.png differ
diff --git a/refilc/assets/icons/ic_splash.png b/refilc/assets/icons/ic_splash.png
index 08e59633..73d331aa 100644
Binary files a/refilc/assets/icons/ic_splash.png and b/refilc/assets/icons/ic_splash.png differ
diff --git a/refilc/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/refilc/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
index 7b563c85..59a249d6 100644
Binary files a/refilc/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and b/refilc/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 8bbb6c5e..856f5e04 100644
Binary files a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index f0be66f0..eca10987 100644
Binary files a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index dff19fd5..b2be096f 100644
Binary files a/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/refilc/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/refilc/ios/Runner/Base.lproj/LaunchScreen.storyboard b/refilc/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f8b5e604..8c0b7cf1 100644
--- a/refilc/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/refilc/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -38,7 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="1700" height="1700"/>
+        <image name="LaunchImage" width="2700" height="2700"/>
         <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/refilc/ios/Runner/Info.plist b/refilc/ios/Runner/Info.plist
index e32ae938..53c7b4b9 100644
--- a/refilc/ios/Runner/Info.plist
+++ b/refilc/ios/Runner/Info.plist
@@ -1,138 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>BGTaskSchedulerPermittedIdentifiers</key>
-	<array>
-		<string>com.transistorsoft.refilcnotification</string>
-		<string>com.transistorsoft.refilcliveactivity</string>
-	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>CFBundleAlternateIcons</key>
 	<dict>
-		<key>refilc_concept</key>
+		<key>BGTaskSchedulerPermittedIdentifiers</key>
+		<array>
+			<string>com.transistorsoft.refilcnotification</string>
+			<string>com.transistorsoft.refilcliveactivity</string>
+		</array>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>CFBundleAlternateIcons</key>
 		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>refilc_concept</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<false/>
+			<key>refilc_concept</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>refilc_concept</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
+			<key>refilc_default</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>refilc_default</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
+			<key>refilc_overcomplicated</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>refilc_overcomplicated</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
+			<key>refilc_pride</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>refilc_pride</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
 		</dict>
-		<key>refilc_default</key>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIcons</key>
 		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>refilc_default</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<false/>
-		</dict>
-		<key>refilc_overcomplicated</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>refilc_overcomplicated</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<false/>
-		</dict>
-		<key>refilc_pride</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
-				<string>refilc_pride</string>
-			</array>
-			<key>UIPrerenderedIcon</key>
-			<false/>
-		</dict>
-	</dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIcons</key>
-	<dict>
-		<key>CFBundlePrimaryIcon</key>
-		<dict>
-			<key>CFBundleIconFiles</key>
-			<array>
+			<key>CFBundlePrimaryIcon</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string></string>
+				</array>
+				<key>CFBundleIconName</key>
 				<string></string>
-			</array>
-			<key>CFBundleIconName</key>
-			<string></string>
-			<key>UIPrerenderedIcon</key>
-			<false/>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
 		</dict>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>reFilc</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleURLTypes</key>
+		<array>
+			<dict>
+				<key>CFBundleTypeRole</key>
+				<string>Editor</string>
+				<key>CFBundleURLSchemes</key>
+				<array>
+					<string>refilcapp</string>
+				</array>
+			</dict>
+		</array>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>ITSAppUsesNonExemptEncryption</key>
+		<false/>
+		<key>LSApplicationQueriesSchemes</key>
+		<array>
+			<string>https</string>
+			<string>http</string>
+		</array>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>NSCameraUsageDescription</key>
+		<string>The app requires the camera access to set a custom profile picture.</string>
+		<key>NSPhotoLibraryUsageDescription</key>
+		<string>The app requires the photo library to set a custom profile picture.</string>
+		<key>NSSupportsLiveActivities</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIBackgroundModes</key>
+		<array>
+			<string>fetch</string>
+			<string>processing</string>
+		</array>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UIStatusBarHidden</key>
+		<false/>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<false/>
 	</dict>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>reFilc</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>refilcapp</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>https</string>
-		<string>http</string>
-	</array>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>NSCameraUsageDescription</key>
-	<string>The app requires the camera access to set a custom profile picture.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>The app requires the photo library to set a custom profile picture.</string>
-	<key>NSSupportsLiveActivities</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>fetch</string>
-		<string>processing</string>
-	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UIStatusBarHidden</key>
-	<false/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
-</dict>
 </plist>
diff --git a/refilc/lib/api/client.dart b/refilc/lib/api/client.dart
index c777dd47..5fcaf4fa 100644
--- a/refilc/lib/api/client.dart
+++ b/refilc/lib/api/client.dart
@@ -21,46 +21,48 @@ class FilcAPI {
   static const baseUrl = "https://api.refilcapp.hu";
 
   // Public API
-  static const schoolList = "$baseUrl/v3/public/school-list";
-  static const news = "0.0.0.0/v4/public/news";
-  static const supporters = "$baseUrl/v3/public/supporters";
+  static const schoolList = "https://api.refilcapp.hu/v3/public/school-list";
+  static const news = "https://staticrf-api.pages.dev/news/index.json";
+  static const supporters = "0.0.0.0";
 
   // Private API
-  static const ads = "0.0.0.0/v3/private/ads";
+  static const ads = "0.0.0.0";
   static const config = "$baseUrl/v3/private/config";
   static const reportApi = "$baseUrl/v3/private/crash-report";
-  static const rfPlus = "0.0.0.0/v3/rf-plus";
-  static const plusAuthLogin = "0.0.0.0/auth/login";
-  static const plusAuthCallback = "0.0.0.0/auth/callback";
-  static const plusActivation = "0.0.0.0/activate";
-  static const plusScopes = "0.0.0.0/scopes";
+  static const rfPlus = "0.0.0.0";
+  static const plusAuthLogin = "0.0.0.0";
+  static const plusAuthCallback = "0.0.0.0";
+  static const plusActivation = "0.0.0.0";
+  static const plusScopes = "0.0.0.0/";
 
   // Updates
   static const repo = "refilc/naplo";
   static const releases = "https://api.github.com/repos/$repo/releases";
 
   // Share API
-  static const themeShare = "$baseUrl/v3/shared/theme/add";
-  static const themeGet = "$baseUrl/v3/shared/theme/get";
+  static const themeShare = "https://api.refilcapp.hu/v3/shared/theme/add";
+  static const themeGet = "https://api.refilcapp.hu/v3/shared/theme/get";
   static const allThemes = "$themeGet/all";
   static const themeByID = "$themeGet/";
 
-  static const gradeColorsShare = "$baseUrl/v3/shared/grade-colors/add";
-  static const gradeColorsGet = "$baseUrl/v3/shared/grade-colors/get";
+  static const gradeColorsShare = "https://api.refilcapp.hu/v3/shared/grade-colors/add";
+  static const gradeColorsGet = "https://api.refilcapp.hu/v3/shared/grade-colors/get";
   static const allGradeColors = "$gradeColorsGet/all";
   static const gradeColorsByID = "$gradeColorsGet/";
 
   // Payment API
-  static const payment = "0.0.0.0/v4/payment";
-  static const stripeSheet = "0.0.0.0/stripe-sheet";
+  static const payment = "0.0.0.0";
+  static const stripeSheet = "0.0.0.0";
 
   // Cloud Sync
   // cloud sync? for what reason
-  static const cloudSyncApi = "0.0.0.0/v4/me/cloud-sync";
+  static const cloudSyncApi = "0.0.0.0";
 
   static Future<bool> checkConnectivity() async =>
       (await Connectivity().checkConnectivity())[0] != ConnectivityResult.none;
 
+
+  // nem tudom nem vazar-e senkit se, de mar ertelmetlen ez
   static Future<List<School>?> getSchools() async {
     try {
       http.Response res = await http.get(Uri.parse(schoolList));
@@ -70,16 +72,6 @@ class FilcAPI {
             .cast<Map>()
             .map((json) => School.fromJson(json))
             .toList();
-        schools.add(School(
-          city: "Stockholm",
-          instituteCode: "refilc-test-sweden",
-          name: "reFilc Test SE - Leo Ekström High School",
-        ));
-        schools.add(School(
-          city: "Madrid",
-          instituteCode: "refilc-test-spain",
-          name: "reFilc Test ES - Emilio Obrero University",
-        ));
         return schools;
       } else {
         throw "HTTP ${res.statusCode}: ${res.body}";
@@ -102,9 +94,7 @@ class FilcAPI {
       "rf-platform-version": settings.analyticsEnabled
           ? Platform.operatingSystemVersion
           : "unknown",
-      "rf-app-version": settings.analyticsEnabled
-          ? const String.fromEnvironment("APPVER", defaultValue: "?")
-          : "unknown",
+      "rf-app-version": const String.fromEnvironment("APPVER", defaultValue: "?"),
       "rf-uinid": settings.xFilcId,
     };
 
@@ -135,7 +125,8 @@ class FilcAPI {
       http.Response res = await http.get(Uri.parse(news));
 
       if (res.statusCode == 200) {
-        return (jsonDecode(res.body) as List)
+        String utf8Body = utf8.decode(res.bodyBytes);
+        return (jsonDecode(utf8Body) as List)
             .cast<Map>()
             .map((e) => News.fromJson(e))
             .toList();
@@ -397,27 +388,6 @@ class FilcAPI {
 
   // cloud sync
   static Future<Map?> cloudSync(Map<String, String> data, String token) async {
-    try {
-      var client = http.Client();
-
-      http.Response res = await client.post(
-        Uri.parse(cloudSyncApi),
-        body: data,
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'Authorization': 'Bearer $token',
-        },
-      );
-
-      if (res.statusCode != 200) {
-        throw "HTTP ${res.statusCode}: ${res.body}";
-      }
-
-      return jsonDecode(res.body);
-    } on Exception catch (error, stacktrace) {
-      log("ERROR: FilcAPI.cloudSync: $error $stacktrace");
-    }
-
     return null;
   }
 }
diff --git a/refilc/lib/api/providers/ad_provider.dart b/refilc/lib/api/providers/ad_provider.dart
index dc369d1a..d10bfaf7 100644
--- a/refilc/lib/api/providers/ad_provider.dart
+++ b/refilc/lib/api/providers/ad_provider.dart
@@ -18,7 +18,7 @@ class AdProvider extends ChangeNotifier {
   }
 
   Future<void> fetch() async {
-    _ads = await FilcAPI.getAds() ?? [];
+    _ads = [];
     _ads.sort((a, b) => -a.date.compareTo(b.date));
 
     // check for new ads
diff --git a/refilc/lib/models/settings.dart b/refilc/lib/models/settings.dart
index 2f295a04..4e172176 100644
--- a/refilc/lib/models/settings.dart
+++ b/refilc/lib/models/settings.dart
@@ -470,7 +470,7 @@ class SettingsProvider extends ChangeNotifier {
       notificationsMessagesEnabled: true,
       notificationsLessonsEnabled: true,
       notificationsBitfield: 255,
-      developerMode: false,
+      developerMode: true,
       notificationPollInterval: 1,
       vibrate: VibrationStrength.medium,
       abWeeks: false,
@@ -478,7 +478,7 @@ class SettingsProvider extends ChangeNotifier {
       updateChannel: UpdateChannel.stable,
       config: Config.fromJson({}),
       xFilcId: const Uuid().v4(),
-      analyticsEnabled: true,
+      analyticsEnabled: false,
       graphClassAvg: false,
       goodStudent: false,
       presentationMode: false,
@@ -506,7 +506,7 @@ class SettingsProvider extends ChangeNotifier {
       currentThemeId: '',
       currentThemeDisplayName: '',
       currentThemeCreator: 'reFilc',
-      showBreaks: true,
+      showBreaks: false,
       pinSetGeneral: '',
       pinSetPersonalize: '',
       pinSetNotify: '',
diff --git a/refilc/pubspec.yaml b/refilc/pubspec.yaml
index f0d15c91..1fb3c244 100644
--- a/refilc/pubspec.yaml
+++ b/refilc/pubspec.yaml
@@ -29,11 +29,11 @@ dependencies:
   sqflite: ^2.2.0+2
   intl: ^0.19.0
   provider: ^6.1.1
-  http: ^1.1.2
+  http: ^1.2.0
   uuid: ^4.2.1
   html: ^0.15.0
   open_filex: ^4.3.4
-  path_provider: ^2.0.2
+  path_provider: ^2.1.3
   permission_handler: ^11.0.1
   share_plus: ^10.0.3
   connectivity_plus: ^6.0.3
@@ -53,7 +53,7 @@ dependencies:
   dropdown_button2: ^2.3.9
   home_widget: ^0.7.0+1
   flutter_expandable_fab: ^2.0.0
-  url_launcher: ^6.1.6
+  url_launcher: ^6.2.5
   flutter_svg: ^2.0.10+1
   image_picker: ^1.0.7
   animations: ^2.0.1
@@ -175,13 +175,13 @@ flutter:
 flutter_launcher_icons:
   image_path: assets/icons/ic_android.png
   android: true
-  adaptive_icon_background: "#03112D"
-  adaptive_icon_foreground: assets/icons/ic_android.png
+  adaptive_icon_background: "#7CA021"
+  adaptive_icon_foreground: assets/icons/ic_launcher_foreground.png
   ios: false
   remove_alpha_ios: false
 
 flutter_native_splash:
-  color: "#03112D"
+  color: "#7CA021"
   image: assets/icons/ic_splash.png
   android_12:
     image: assets/icons/ic_splash.png
diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
index 677e6d21..9edc9218 100644
--- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
+++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
@@ -16,6 +16,7 @@ import 'package:refilc_kreta_api/providers/note_provider.dart';
 import 'package:refilc_kreta_api/providers/timetable_provider.dart';
 import 'package:refilc/api/providers/user_provider.dart';
 import 'package:refilc/api/providers/database_provider.dart';
+
 // import 'package:refilc/utils/format.dart';
 import 'package:refilc/models/settings.dart';
 import 'package:refilc/models/user.dart';
@@ -23,20 +24,25 @@ import 'package:refilc/theme/colors/colors.dart';
 import 'package:refilc_kreta_api/client/client.dart';
 import 'package:refilc_mobile_ui/common/action_button.dart';
 import 'package:refilc_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu.dart';
+
 // import 'package:refilc_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_item.dart';
 import 'package:refilc_mobile_ui/common/panel/panel.dart';
 import 'package:refilc_mobile_ui/common/panel/panel_button.dart';
 import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
 import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
+
 // import 'package:refilc_mobile_ui/common/soon_alert/soon_alert.dart';
 import 'package:refilc_mobile_ui/common/splitted_panel/splitted_panel.dart';
 import 'package:refilc_mobile_ui/common/system_chrome.dart';
+
 // import 'package:refilc_mobile_ui/common/system_chrome.dart';
 import 'package:refilc_mobile_ui/common/widgets/update/updates_view.dart';
 import 'package:refilc_mobile_ui/screens/news/news_screen.dart';
+
 // import 'package:refilc_mobile_ui/screens/notes/notes_screen.dart';
 import 'package:refilc_mobile_ui/screens/settings/accounts/account_tile.dart';
 import 'package:refilc_mobile_ui/screens/settings/accounts/account_view.dart';
+
 // import 'package:refilc_mobile_ui/screens/settings/debug/subject_icon_gallery.dart';
 // import 'package:refilc_mobile_ui/screens/settings/modify_subject_names.dart';
 import 'package:refilc_mobile_ui/screens/settings/notifications_screen.dart';
@@ -46,11 +52,14 @@ import 'package:refilc_mobile_ui/screens/settings/submenu/code_scanner.dart';
 import 'package:refilc_mobile_ui/screens/settings/submenu/extras_screen.dart';
 import 'package:refilc_mobile_ui/screens/settings/submenu/personalize_screen.dart';
 import 'package:flutter/foundation.dart';
+
 // import 'package:refilc_plus/models/premium_scopes.dart';
 import 'package:refilc_plus/providers/plus_provider.dart';
+
 // import 'package:refilc_plus/ui/mobile/plus/upsell.dart';
 // import 'package:refilc_plus/ui/mobile/settings/app_icon_screen.dart';
 import 'package:flutter/cupertino.dart';
+
 // import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_custom_tabs/flutter_custom_tabs.dart' as tabs;
@@ -64,6 +73,7 @@ import 'settings_screen.i18n.dart';
 import 'package:flutter/services.dart';
 import 'package:refilc_mobile_ui/screens/settings/user/nickname.dart';
 import 'package:refilc_mobile_ui/screens/settings/user/profile_pic.dart';
+
 // import 'package:refilc_plus/ui/mobile/settings/modify_teacher_names.dart';
 // import 'package:refilc_plus/ui/mobile/settings/welcome_message.dart';
 // import 'package:refilc_mobile_ui/screens/error_screen.dart';
@@ -97,7 +107,8 @@ class SettingsScreenState extends State<SettingsScreen>
 
   late AnimationController _hideContainersController;
 
-  Future<void> restore() => Future.wait([
+  Future<void> restore() =>
+      Future.wait([
         Provider.of<GradeProvider>(context, listen: false).restore(),
         Provider.of<TimetableProvider>(context, listen: false).restoreUser(),
         Provider.of<ExamProvider>(context, listen: false).restore(),
@@ -121,8 +132,8 @@ class SettingsScreenState extends State<SettingsScreen>
       String _firstName;
 
       List<String> _nameParts =
-          (account.nickname != '' ? account.nickname : account.displayName)
-              .split(" ");
+      (account.nickname != '' ? account.nickname : account.displayName)
+          .split(" ");
       if (!settings.presentationMode) {
         _firstName = _nameParts.length > 1 ? _nameParts[1] : _nameParts[0];
       } else {
@@ -142,7 +153,8 @@ class SettingsScreenState extends State<SettingsScreen>
             name: _firstName,
             role: account.role,
             profilePictureString: account.picture,
-            backgroundColor: Theme.of(context)
+            backgroundColor: Theme
+                .of(context)
                 .colorScheme
                 .tertiary, //!settings.presentationMode
             //? ColorUtils.stringToColor(account.name)
@@ -156,45 +168,57 @@ class SettingsScreenState extends State<SettingsScreen>
             if (err != null) {
               showDialog(
                 context: context,
-                builder: (_) => AlertDialog(
-                  shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(12.0)),
-                  title: Text('oopsie'.i18n),
-                  content: Text('session_expired'.i18n),
-                  actions: [
-                    ActionButton(
-                        label: "Ok",
-                        onTap: () async {
-                          String? userId = user.id;
-                          if (userId == null) return;
+                builder: (_) =>
+                    AlertDialog(
+                      shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(12.0)),
+                      title: Text('oopsie'.i18n),
+                      content: Text('session_expired'.i18n),
+                      actions: [
+                        ActionButton(
+                            label: "Ok",
+                            onTap: () async {
+                              String? userId = user.id;
+                              if (userId == null) return;
 
-                          // delete user
-                          user.removeUser(userId);
-                          await Provider.of<DatabaseProvider>(context,
+                              // delete user
+                              user.removeUser(userId);
+                              await Provider
+                                  .of<DatabaseProvider>(context,
                                   listen: false)
-                              .store
-                              .removeUser(userId);
+                                  .store
+                                  .removeUser(userId);
 
-                          // if no users, show login, else login with back button
-                          if (user.getUsers().isNotEmpty) {
-                            user.setUser(user.getUsers().first.id);
-                            restore().then(
-                                (_) => user.setUser(user.getUsers().first.id));
+                              // if no users, show login, else login with back button
+                              if (user
+                                  .getUsers()
+                                  .isNotEmpty) {
+                                user.setUser(user
+                                    .getUsers()
+                                    .first
+                                    .id);
+                                restore().then(
+                                        (_) =>
+                                        user.setUser(user
+                                            .getUsers()
+                                            .first
+                                            .id));
 
-                            Navigator.of(context).pop();
-                            Navigator.of(context)
-                                .pushNamed("login_back")
-                                .then((value) {
-                              setSystemChrome(context);
-                            });
-                          } else {
-                            Navigator.of(context).pop();
-                            Navigator.of(context)
-                                .pushNamedAndRemoveUntil("login", (_) => false);
-                          }
-                        })
-                  ],
-                ),
+                                Navigator.of(context).pop();
+                                Navigator.of(context)
+                                    .pushNamed("login_back")
+                                    .then((value) {
+                                  setSystemChrome(context);
+                                });
+                              } else {
+                                Navigator.of(context).pop();
+                                Navigator.of(context)
+                                    .pushNamedAndRemoveUntil(
+                                    "login", (_) => false);
+                              }
+                            })
+                      ],
+                    ),
               );
               return;
             }
@@ -236,14 +260,17 @@ class SettingsScreenState extends State<SettingsScreen>
     ]);
   }
 
-  void _openDKT(User u) => tabs.launchUrl(
+  void _openDKT(User u) =>
+      tabs.launchUrl(
         Uri.parse(
             "https://dkttanulo.e-kreta.hu/sso?id_token=${kretaClient.idToken}"),
         customTabsOptions: tabs.CustomTabsOptions(
           showTitle: true,
           colorSchemes: tabs.CustomTabsColorSchemes(
             defaultPrams: tabs.CustomTabsColorSchemeParams(
-              toolbarColor: Theme.of(context).scaffoldBackgroundColor,
+              toolbarColor: Theme
+                  .of(context)
+                  .scaffoldBackgroundColor,
             ),
           ),
         ),
@@ -289,10 +316,10 @@ class SettingsScreenState extends State<SettingsScreen>
     // String startPageTitle =
     //     SettingsHelper.localizedPageTitles()[settings.startPage] ?? "?";
     String themeModeText = {
-          ThemeMode.light: "light".i18n,
-          ThemeMode.dark: "dark".i18n,
-          ThemeMode.system: "system".i18n
-        }[settings.theme] ??
+      ThemeMode.light: "light".i18n,
+      ThemeMode.dark: "dark".i18n,
+      ThemeMode.system: "system".i18n
+    }[settings.theme] ??
         "?";
     // String languageText = SettingsHelper.langMap[settings.language] ?? "?";
     // String vibrateTitle = {
@@ -309,441 +336,484 @@ class SettingsScreenState extends State<SettingsScreen>
 
     return AnimatedBuilder(
       animation: _hideContainersController,
-      builder: (context, child) => Opacity(
-        opacity: 1 - _hideContainersController.value,
-        child: Column(
-          children: [
-            const SizedBox(height: 45.0),
-
-            Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      builder: (context, child) =>
+          Opacity(
+            opacity: 1 - _hideContainersController.value,
+            child: Column(
               children: [
-                const Row(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  children: [
-                    // IconButton(
-                    //   splashRadius: 32.0,
-                    //   onPressed: () =>
-                    //       _showBottomSheet(user.getUser(user.id ?? "")),
-                    //   icon: Icon(FeatherIcons.moreVertical,
-                    //       color: AppColors.of(context).text.withOpacity(0.8)),
-                    // ),
-                    // const SizedBox(
-                    //   width: 5,
-                    // ),
-                    // const SizedBox(
-                    //   width: 5.0,
-                    // ),
-                    // IconButton(
-                    //   splashRadius: 32.0,
-                    //   // onPressed: () async => await databaseProvider.userStore
-                    //   //     .storeSelfNotes([], userId: user.id!),
-                    //   onPressed: () async => _openNotes(
-                    //     context,
-                    //     await databaseProvider.userQuery
-                    //         .toDoItems(userId: user.id!),
-                    //   ),
-                    //   // _showBottomSheet(user.getUser(user.id ?? "")),
-                    //   icon: Icon(FeatherIcons.fileText,
-                    //       color: AppColors.of(context).text.withOpacity(0.8)),
-                    // ),
-                  ],
-                ),
+                const SizedBox(height: 45.0),
+
                 Row(
-                  mainAxisAlignment: MainAxisAlignment.end,
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    IconButton(
-                      splashRadius: 26.0,
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                      icon: Icon(FeatherIcons.x,
-                          color: AppColors.of(context).text.withOpacity(0.8)),
+                    const Row(
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        // IconButton(
+                        //   splashRadius: 32.0,
+                        //   onPressed: () =>
+                        //       _showBottomSheet(user.getUser(user.id ?? "")),
+                        //   icon: Icon(FeatherIcons.moreVertical,
+                        //       color: AppColors.of(context).text.withOpacity(0.8)),
+                        // ),
+                        // const SizedBox(
+                        //   width: 5,
+                        // ),
+                        // const SizedBox(
+                        //   width: 5.0,
+                        // ),
+                        // IconButton(
+                        //   splashRadius: 32.0,
+                        //   // onPressed: () async => await databaseProvider.userStore
+                        //   //     .storeSelfNotes([], userId: user.id!),
+                        //   onPressed: () async => _openNotes(
+                        //     context,
+                        //     await databaseProvider.userQuery
+                        //         .toDoItems(userId: user.id!),
+                        //   ),
+                        //   // _showBottomSheet(user.getUser(user.id ?? "")),
+                        //   icon: Icon(FeatherIcons.fileText,
+                        //       color: AppColors.of(context).text.withOpacity(0.8)),
+                        // ),
+                      ],
                     ),
-                    const SizedBox(
-                      width: 5.0,
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.end,
+                      children: [
+                        IconButton(
+                          splashRadius: 26.0,
+                          onPressed: () {
+                            Navigator.of(context).pop();
+                          },
+                          icon: Icon(FeatherIcons.x,
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(0.8)),
+                        ),
+                        const SizedBox(
+                          width: 5.0,
+                        ),
+                      ],
                     ),
                   ],
                 ),
-              ],
-            ),
 
-            Padding(
-              padding: const EdgeInsets.symmetric(vertical: 8.0),
-              child: ProfileImage(
-                heroTag: "profile",
-                radius: 48.42069,
-                onTap: () => _showBottomSheet(user.getUser(user.id ?? "")),
-                name: firstName,
-                badge: updateProvider.available,
-                role: user.role,
-                profilePictureString: user.picture,
-                gradeStreak: (user.gradeStreak ?? 0) > 1,
-                backgroundColor: Theme.of(context)
-                    .colorScheme
-                    .tertiary, //!settings.presentationMode
-                //? ColorUtils.stringToColor(user.displayName ?? "?")
-                //: Theme.of(context).colorScheme.secondary,
-              ),
-            ),
-
-            Padding(
-              padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
-              child: GestureDetector(
-                onTap: () => _showBottomSheet(user.getUser(user.id ?? "")),
-                onDoubleTap: () => setState(() => __ss = true),
-                child: Text(
-                  !settings.presentationMode
-                      ? (user.displayName ?? "?")
-                      : "János",
-                  maxLines: 1,
-                  softWrap: false,
-                  overflow: TextOverflow.ellipsis,
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                      fontSize: 22.0,
-                      fontWeight: FontWeight.w600,
-                      color: AppColors.of(context).text),
-                ),
-              ),
-            ),
-
-            const SizedBox(
-              height: 18.0,
-            ),
-
-            // user options
-            SplittedPanel(
-              cardPadding: const EdgeInsets.all(4.0),
-              children: [
-                // personal details
-                PanelButton(
-                  onPressed: () =>
-                      AccountView.show(user.user!, context: context),
-                  title: Text("personal_details".i18n),
-                  leading: Icon(
-                    FeatherIcons.info,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(12.0), bottom: Radius.circular(4.0)),
-                ),
-                // cloud-sync
-                const MenuCloudSyncSettings(
-                  borderRadius: BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(4.0),
+                Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 8.0),
+                  child: ProfileImage(
+                    heroTag: "profile",
+                    radius: 48.42069,
+                    onTap: () => _showBottomSheet(user.getUser(user.id ?? "")),
+                    name: firstName,
+                    badge: updateProvider.available,
+                    role: user.role,
+                    profilePictureString: user.picture,
+                    gradeStreak: (user.gradeStreak ?? 0) > 1,
+                    backgroundColor: Theme
+                        .of(context)
+                        .colorScheme
+                        .tertiary, //!settings.presentationMode
+                    //? ColorUtils.stringToColor(user.displayName ?? "?")
+                    //: Theme.of(context).colorScheme.secondary,
                   ),
                 ),
-                // open dcs (digital collaboration space)
-                PanelButton(
-                  onPressed: () => _openDKT(user.user!),
-                  title: Text("open_dkt".i18n),
-                  leading: Icon(
-                    FeatherIcons.grid,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
-                ),
-                // edit user
-                PanelButton(
-                  onPressed: () =>
-                      _showBottomSheet(user.getUser(user.id ?? "")),
-                  title: Text("edit".i18n),
-                  leading: Icon(
-                    FeatherIcons.edit3,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
-                ),
-                // switch account
-                PanelButton(
-                  // onPressed: () => SoonAlert.show(context: context),
-                  onPressed: () {
-                    SettingsHelper.changeCurrentUser(
-                      context,
-                      accountTiles,
-                      (accountTiles.length + 2),
-                      "add_user".i18n,
-                    );
-                  },
-                  title: Text("switch_account".i18n),
-                  leading: Icon(
-                    FeatherIcons.users,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(4.0), bottom: Radius.circular(4.0)),
-                ),
-                // log user out
-                PanelButton(
-                  onPressed: () async {
-                    String? userId = user.id;
-                    if (userId == null) return;
 
-                    // delete user
-                    user.removeUser(userId);
-                    await Provider.of<DatabaseProvider>(context, listen: false)
-                        .store
-                        .removeUser(userId);
-
-                    // if no users, show login
-                    if (user.getUsers().isNotEmpty) {
-                      user.setUser(user.getUsers().first.id);
-                      restore()
-                          .then((_) => user.setUser(user.getUsers().first.id));
-                    } else {
-                      Navigator.of(context)
-                          .pushNamedAndRemoveUntil("login", (_) => false);
-                    }
-                  },
-                  title: Text("log_out".i18n),
-                  leading: Icon(
-                    FeatherIcons.logOut,
-                    color: AppColors.of(context).red,
-                    size: 22.0,
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(4.0), bottom: Radius.circular(12.0)),
-                ),
-                // SplittedMenuOption(
-                //   padding: const EdgeInsets.all(8.0),
-                //   text: 'edit'.i18n,
-                //   trailing: const Icon(
-                //     FeatherIcons.edit2,
-                //     size: 22.0,
-                //   ),
-                //   onTap: () {
-                //     print('object');
-                //   },
-                // ),
-              ],
-            ),
-
-            // Padding(
-            //   padding:
-            //       const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
-            //   child: Panel(
-            //     child: Column(
-            //       children: [
-            //         // account list
-            //         ...accountTiles,
-
-            //         if (accountTiles.isNotEmpty)
-            //           Center(
-            //             child: Container(
-            //               margin: const EdgeInsets.only(top: 12.0, bottom: 4.0),
-            //               height: 3.0,
-            //               width: 75.0,
-            //               decoration: BoxDecoration(
-            //                 borderRadius: BorderRadius.circular(12.0),
-            //                 color: AppColors.of(context).text.withOpacity(.25),
-            //               ),
-            //             ),
-            //           ),
-
-            //         // add account panel
-            //         PanelButton(
-            //           onPressed: () {
-            //             if (!Provider.of<PlusProvider>(context,
-            //                     listen: false)
-            //                 .hasScope(PremiumScopes.maxTwoAccounts)) {
-            //               PlusLockedFeaturePopup.show(
-            //                   context: context,
-            //                   feature: PremiumFeature.moreAccounts);
-            //               return;
-            //             }
-
-            //             Navigator.of(context)
-            //                 .pushNamed("login_back")
-            //                 .then((value) {
-            //               setSystemChrome(context);
-            //             });
-            //           },
-            //           title: Text("add_user".i18n),
-            //           leading: const Icon(FeatherIcons.userPlus),
-            //         ),
-            //         // PanelButton(
-            //         //   onPressed: () async {
-            //         //     String? userId = user.id;
-            //         //     if (userId == null) return;
-
-            //         //     // Delete User
-            //         //     user.removeUser(userId);
-            //         //     await Provider.of<DatabaseProvider>(context,
-            //         //             listen: false)
-            //         //         .store
-            //         //         .removeUser(userId);
-
-            //         //     // If no other Users left, go back to LoginScreen
-            //         //     if (user.getUsers().isNotEmpty) {
-            //         //       user.setUser(user.getUsers().first.id);
-            //         //       restore().then(
-            //         //           (_) => user.setUser(user.getUsers().first.id));
-            //         //     } else {
-            //         //       Navigator.of(context)
-            //         //           .pushNamedAndRemoveUntil("login", (_) => false);
-            //         //     }
-            //         //   },
-            //         //   title: Text("log_out".i18n),
-            //         //   leading: Icon(FeatherIcons.logOut,
-            //         //       color: AppColors.of(context).red),
-            //         // ),
-            //       ],
-            //     ),
-            //   ),
-            // ),
-
-            // updates
-            if (updateProvider.available)
-              Padding(
-                padding: const EdgeInsets.symmetric(
-                    vertical: 12.0, horizontal: 24.0),
-                child: Panel(
-                  child: PanelButton(
-                    onPressed: () => _openUpdates(context),
-                    title: Text("update_available".i18n),
-                    leading: const Icon(FeatherIcons.download),
-                    trailing: Text(
-                      updateProvider.releases.first.tag,
+                Padding(
+                  padding: const EdgeInsets.only(top: 4.0, bottom: 12.0),
+                  child: GestureDetector(
+                    onTap: () => _showBottomSheet(user.getUser(user.id ?? "")),
+                    onDoubleTap: () => setState(() => __ss = true),
+                    child: Text(
+                      !settings.presentationMode
+                          ? (user.displayName ?? "?")
+                          : "János",
+                      maxLines: 1,
+                      softWrap: false,
+                      overflow: TextOverflow.ellipsis,
+                      textAlign: TextAlign.center,
                       style: TextStyle(
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).colorScheme.secondary,
-                      ),
+                          fontSize: 22.0,
+                          fontWeight: FontWeight.w600,
+                          color: AppColors
+                              .of(context)
+                              .text),
                     ),
                   ),
                 ),
-              ),
 
-            // const Padding(
-            //   padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
-            //   child: PremiumBannerButton(),
-            // ),
-            // if (!context.watch<PlusProvider>().hasPremium)
-            //   const ClipRect(
-            //     child: Padding(
-            //       padding: EdgeInsets.symmetric(vertical: 12.0),
-            //       child: PremiumButton(),
-            //     ),
-            //   )
-            // else
-            //   const Padding(
-            //     padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
-            //     child: ActiveSponsorCard(),
-            //   ),
+                const SizedBox(
+                  height: 18.0,
+                ),
 
-            // secret settings
-            if (__ss)
-              SplittedPanel(
-                isSeparated: true,
-                isTransparent: true,
-                hasShadow: false,
-                children: [
-                  SplittedPanel(
-                    title: Text("secret".i18n),
-                    cardPadding: const EdgeInsets.all(4.0),
-                    padding: EdgeInsets.zero,
-                    children: [
-                      // good student mode
-                      Material(
-                        type: MaterialType.transparency,
-                        child: SwitchListTile(
-                          contentPadding:
-                              const EdgeInsets.only(left: 12.0, right: 6.0),
-                          shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(12.0)),
-                          title: Text("goodstudent".i18n,
-                              style:
-                                  const TextStyle(fontWeight: FontWeight.w500)),
-                          onChanged: (v) {
-                            if (v) {
-                              showDialog(
-                                context: context,
-                                builder: (context) => WillPopScope(
-                                  onWillPop: () async => false,
-                                  child: AlertDialog(
-                                    shape: RoundedRectangleBorder(
-                                        borderRadius:
-                                            BorderRadius.circular(12.0)),
-                                    title: Text("attention".i18n),
-                                    content:
-                                        Text("goodstudent_disclaimer".i18n),
-                                    actions: [
-                                      ActionButton(
-                                          label: "understand".i18n,
-                                          onTap: () {
-                                            Navigator.of(context).pop();
-                                            settings.update(goodStudent: v);
-                                            Provider.of<GradeProvider>(context,
-                                                    listen: false)
-                                                .convertBySettings();
-                                          })
-                                    ],
-                                  ),
-                                ),
-                              );
-                            } else {
-                              settings.update(goodStudent: v);
-                              Provider.of<GradeProvider>(context, listen: false)
-                                  .convertBySettings();
-                            }
-                          },
-                          value: settings.goodStudent,
-                          activeColor: Theme.of(context).colorScheme.secondary,
+                // user options
+                SplittedPanel(
+                  cardPadding: const EdgeInsets.all(4.0),
+                  children: [
+                    // personal details
+                    PanelButton(
+                      onPressed: () =>
+                          AccountView.show(user.user!, context: context),
+                      title: Text("personal_details".i18n),
+                      leading: Icon(
+                        FeatherIcons.info,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(12.0),
+                          bottom: Radius.circular(4.0)),
+                    ),
+                    // open dcs (digital collaboration space)
+                    PanelButton(
+                      onPressed: () => _openDKT(user.user!),
+                      title: Text("open_dkt".i18n),
+                      leading: Icon(
+                        FeatherIcons.grid,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(4.0),
+                          bottom: Radius.circular(4.0)),
+                    ),
+                    // edit user
+                    PanelButton(
+                      onPressed: () =>
+                          _showBottomSheet(user.getUser(user.id ?? "")),
+                      title: Text("edit".i18n),
+                      leading: Icon(
+                        FeatherIcons.edit3,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(4.0),
+                          bottom: Radius.circular(4.0)),
+                    ),
+                    // switch account
+                    PanelButton(
+                      // onPressed: () => SoonAlert.show(context: context),
+                      onPressed: () {
+                        SettingsHelper.changeCurrentUser(
+                          context,
+                          accountTiles,
+                          (accountTiles.length + 2),
+                          "add_user".i18n,
+                        );
+                      },
+                      title: Text("switch_account".i18n),
+                      leading: Icon(
+                        FeatherIcons.users,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(4.0),
+                          bottom: Radius.circular(4.0)),
+                    ),
+                    // log user out
+                    PanelButton(
+                      onPressed: () async {
+                        String? userId = user.id;
+                        if (userId == null) return;
+
+                        // delete user
+                        user.removeUser(userId);
+                        await Provider
+                            .of<DatabaseProvider>(context, listen: false)
+                            .store
+                            .removeUser(userId);
+
+                        // if no users, show login
+                        if (user
+                            .getUsers()
+                            .isNotEmpty) {
+                          user.setUser(user
+                              .getUsers()
+                              .first
+                              .id);
+                          restore()
+                              .then((_) =>
+                              user.setUser(user
+                                  .getUsers()
+                                  .first
+                                  .id));
+                        } else {
+                          Navigator.of(context)
+                              .pushNamedAndRemoveUntil("login", (_) => false);
+                        }
+                      },
+                      title: Text("log_out".i18n),
+                      leading: Icon(
+                        FeatherIcons.logOut,
+                        color: AppColors
+                            .of(context)
+                            .red,
+                        size: 22.0,
+                      ),
+                      borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(4.0),
+                          bottom: Radius.circular(12.0)),
+                    ),
+                    // SplittedMenuOption(
+                    //   padding: const EdgeInsets.all(8.0),
+                    //   text: 'edit'.i18n,
+                    //   trailing: const Icon(
+                    //     FeatherIcons.edit2,
+                    //     size: 22.0,
+                    //   ),
+                    //   onTap: () {
+                    //     print('object');
+                    //   },
+                    // ),
+                  ],
+                ),
+
+                // Padding(
+                //   padding:
+                //       const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
+                //   child: Panel(
+                //     child: Column(
+                //       children: [
+                //         // account list
+                //         ...accountTiles,
+
+                //         if (accountTiles.isNotEmpty)
+                //           Center(
+                //             child: Container(
+                //               margin: const EdgeInsets.only(top: 12.0, bottom: 4.0),
+                //               height: 3.0,
+                //               width: 75.0,
+                //               decoration: BoxDecoration(
+                //                 borderRadius: BorderRadius.circular(12.0),
+                //                 color: AppColors.of(context).text.withOpacity(.25),
+                //               ),
+                //             ),
+                //           ),
+
+                //         // add account panel
+                //         PanelButton(
+                //           onPressed: () {
+                //             if (!Provider.of<PlusProvider>(context,
+                //                     listen: false)
+                //                 .hasScope(PremiumScopes.maxTwoAccounts)) {
+                //               PlusLockedFeaturePopup.show(
+                //                   context: context,
+                //                   feature: PremiumFeature.moreAccounts);
+                //               return;
+                //             }
+
+                //             Navigator.of(context)
+                //                 .pushNamed("login_back")
+                //                 .then((value) {
+                //               setSystemChrome(context);
+                //             });
+                //           },
+                //           title: Text("add_user".i18n),
+                //           leading: const Icon(FeatherIcons.userPlus),
+                //         ),
+                //         // PanelButton(
+                //         //   onPressed: () async {
+                //         //     String? userId = user.id;
+                //         //     if (userId == null) return;
+
+                //         //     // Delete User
+                //         //     user.removeUser(userId);
+                //         //     await Provider.of<DatabaseProvider>(context,
+                //         //             listen: false)
+                //         //         .store
+                //         //         .removeUser(userId);
+
+                //         //     // If no other Users left, go back to LoginScreen
+                //         //     if (user.getUsers().isNotEmpty) {
+                //         //       user.setUser(user.getUsers().first.id);
+                //         //       restore().then(
+                //         //           (_) => user.setUser(user.getUsers().first.id));
+                //         //     } else {
+                //         //       Navigator.of(context)
+                //         //           .pushNamedAndRemoveUntil("login", (_) => false);
+                //         //     }
+                //         //   },
+                //         //   title: Text("log_out".i18n),
+                //         //   leading: Icon(FeatherIcons.logOut,
+                //         //       color: AppColors.of(context).red),
+                //         // ),
+                //       ],
+                //     ),
+                //   ),
+                // ),
+
+                // updates
+                if (updateProvider.available)
+                  Padding(
+                    padding: const EdgeInsets.symmetric(
+                        vertical: 12.0, horizontal: 24.0),
+                    child: Panel(
+                      child: PanelButton(
+                        onPressed: () => _openUpdates(context),
+                        title: Text("update_available".i18n),
+                        leading: const Icon(FeatherIcons.download),
+                        trailing: Text(
+                          updateProvider.releases.first.tag,
+                          style: TextStyle(
+                            fontWeight: FontWeight.w500,
+                            color: Theme
+                                .of(context)
+                                .colorScheme
+                                .secondary,
+                          ),
                         ),
                       ),
-                    ],
+                    ),
                   ),
-                  SplittedPanel(
-                    cardPadding: const EdgeInsets.all(4.0),
-                    padding: EdgeInsets.zero,
-                    children: [
-                      // presentation mode
-                      Material(
-                        type: MaterialType.transparency,
-                        child: SwitchListTile(
-                          contentPadding:
-                              const EdgeInsets.only(left: 12.0, right: 6.0),
-                          shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(12.0)),
-                          title: Text("presentation".i18n,
-                              style:
-                                  const TextStyle(fontWeight: FontWeight.w500)),
-                          onChanged: (v) =>
-                              settings.update(presentationMode: v),
-                          value: settings.presentationMode,
-                          activeColor: Theme.of(context).colorScheme.secondary,
-                        ),
-                      ),
 
-                      // UwU-fied mode (why????)
-                      // Material(
-                      //   type: MaterialType.transparency,
-                      //   child: SwitchListTile(
-                      //     contentPadding: const EdgeInsets.only(left: 12.0),
-                      //     shape: RoundedRectangleBorder(
-                      //         borderRadius: BorderRadius.circular(12.0)),
-                      //     title: Text("uwufymode".i18n,
-                      //         style:
-                      //             const TextStyle(fontWeight: FontWeight.w500)),
-                      //     onChanged: (v) {
-                      //       SettingsHelper.uwuMode(context, v);
-                      //       setState(() {});
-                      //     },
-                      //     value: settings.presentationMode,
-                      //     activeColor: Theme.of(context).colorScheme.secondary,
-                      //   ),
-                      // ),
-                    ],
-                  ),
-                  // uwu mode
+                // const Padding(
+                //   padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
+                //   child: PremiumBannerButton(),
+                // ),
+                // if (!context.watch<PlusProvider>().hasPremium)
+                //   const ClipRect(
+                //     child: Padding(
+                //       padding: EdgeInsets.symmetric(vertical: 12.0),
+                //       child: PremiumButton(),
+                //     ),
+                //   )
+                // else
+                //   const Padding(
+                //     padding: EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
+                //     child: ActiveSponsorCard(),
+                //   ),
+
+                // secret settings
+                if (__ss)
                   SplittedPanel(
+                    isSeparated: true,
+                    isTransparent: true,
+                    hasShadow: false,
+                    children: [
+                      SplittedPanel(
+                        title: Text("secret".i18n),
+                        cardPadding: const EdgeInsets.all(4.0),
+                        padding: EdgeInsets.zero,
+                        children: [
+                          // good student mode
+                          Material(
+                            type: MaterialType.transparency,
+                            child: SwitchListTile(
+                              contentPadding:
+                              const EdgeInsets.only(left: 12.0, right: 6.0),
+                              shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(12.0)),
+                              title: Text("goodstudent".i18n,
+                                  style:
+                                  const TextStyle(fontWeight: FontWeight.w500)),
+                              onChanged: (v) {
+                                if (v) {
+                                  showDialog(
+                                    context: context,
+                                    builder: (context) =>
+                                        WillPopScope(
+                                          onWillPop: () async => false,
+                                          child: AlertDialog(
+                                            shape: RoundedRectangleBorder(
+                                                borderRadius:
+                                                BorderRadius.circular(12.0)),
+                                            title: Text("attention".i18n),
+                                            content:
+                                            Text("goodstudent_disclaimer".i18n),
+                                            actions: [
+                                              ActionButton(
+                                                  label: "understand".i18n,
+                                                  onTap: () {
+                                                    Navigator.of(context).pop();
+                                                    settings.update(
+                                                        goodStudent: v);
+                                                    Provider.of<GradeProvider>(
+                                                        context,
+                                                        listen: false)
+                                                        .convertBySettings();
+                                                  })
+                                            ],
+                                          ),
+                                        ),
+                                  );
+                                } else {
+                                  settings.update(goodStudent: v);
+                                  Provider.of<GradeProvider>(
+                                      context, listen: false)
+                                      .convertBySettings();
+                                }
+                              },
+                              value: settings.goodStudent,
+                              activeColor: Theme
+                                  .of(context)
+                                  .colorScheme
+                                  .secondary,
+                            ),
+                          ),
+                        ],
+                      ),
+                      SplittedPanel(
+                        cardPadding: const EdgeInsets.all(4.0),
+                        padding: EdgeInsets.zero,
+                        children: [
+                          // presentation mode
+                          Material(
+                            type: MaterialType.transparency,
+                            child: SwitchListTile(
+                              contentPadding:
+                              const EdgeInsets.only(left: 12.0, right: 6.0),
+                              shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.circular(12.0)),
+                              title: Text("presentation".i18n,
+                                  style:
+                                  const TextStyle(fontWeight: FontWeight.w500)),
+                              onChanged: (v) =>
+                                  settings.update(presentationMode: v),
+                              value: settings.presentationMode,
+                              activeColor: Theme
+                                  .of(context)
+                                  .colorScheme
+                                  .secondary,
+                            ),
+                          ),
+
+                          // UwU-fied mode (why????)
+                          // Material(
+                          //   type: MaterialType.transparency,
+                          //   child: SwitchListTile(
+                          //     contentPadding: const EdgeInsets.only(left: 12.0),
+                          //     shape: RoundedRectangleBorder(
+                          //         borderRadius: BorderRadius.circular(12.0)),
+                          //     title: Text("uwufymode".i18n,
+                          //         style:
+                          //             const TextStyle(fontWeight: FontWeight.w500)),
+                          //     onChanged: (v) {
+                          //       SettingsHelper.uwuMode(context, v);
+                          //       setState(() {});
+                          //     },
+                          //     value: settings.presentationMode,
+                          //     activeColor: Theme.of(context).colorScheme.secondary,
+                          //   ),
+                          // ),
+                        ],
+                      ),
+                      // uwu mode
+                      // since it is not working i removed it
+                      /*SplittedPanel(
                     cardPadding: const EdgeInsets.all(4.0),
                     padding: EdgeInsets.zero,
                     children: [
@@ -764,373 +834,379 @@ class SettingsScreenState extends State<SettingsScreen>
                         ),
                       ),
                     ],
-                  ),
-                ],
-              ),
-
-            if ((user.gradeStreak ?? 0) > 1)
-              SplittedPanel(
-                padding: const EdgeInsets.only(
-                    bottom: 12.0, left: 24.0, right: 24.0),
-                children: [
-                  GestureDetector(
-                    onTap: () {
-                      SoonAlert.show(context: context);
-                    },
-                    child: ListTile(
-                      title: Text(
-                        "grade_streak".i18n,
-                        style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(0.95),
-                          fontWeight: FontWeight.w500,
-                        ),
-                      ),
-                      subtitle: Text(
-                        "grade_streak_subtitle".i18n,
-                        style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(0.75),
-                        ),
-                      ),
-                      leading: Image.asset(
-                        'assets/images/apple_fire_emoji.png',
-                        width: 24.0,
-                      ),
-                      // leading: const Text(
-                      //   "🔥",
-                      //   style: TextStyle(fontSize: 22.0),
-                      // ),
-                      trailing: Text(
-                        "${user.gradeStreak}",
-                        style: TextStyle(
-                          color: AppColors.of(context).text.withOpacity(0.95),
-                          fontWeight: FontWeight.w500,
-                          fontSize: 18.0,
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-
-            // plus subscribe inline
-            const PlusSettingsInline(),
-
-            // const SizedBox(
-            //   height: 16.0,
-            // ),
-
-            // Panel(
-            //   hasShadow: false,
-            //   padding: const EdgeInsets.only(left: 24.0, right: 24.0),
-            //   title: Padding(
-            //     padding: const EdgeInsets.only(left: 24.0),
-            //     child: Text('account_link'.i18n),
-            //   ),
-            //   isTransparent: true,
-            //   child: Column(
-            //     children: [
-            //       // QwID account linking
-            //       PanelButton(
-            //         onPressed: () {
-            //           launchUrl(
-            //             Uri.parse(
-            //                 'https://qwid.qwit.dev/oauth2/authorize?client_id=refilc&response_type=code&scope=*'),
-            //             mode: LaunchMode.externalApplication,
-            //           );
-            //         },
-            //         title: Text("QwID fiók-összekapcsolás".i18n),
-            //         leading: Icon(
-            //           FeatherIcons.link,
-            //           size: 22.0,
-            //           color: AppColors.of(context).text.withOpacity(0.95),
-            //         ),
-            //         trailing: GestureDetector(
-            //           onTap: () {
-            //             showDialog(
-            //               context: context,
-            //               builder: (BuildContext context) {
-            //                 return AlertDialog(
-            //                   title: const Text("QwID?!"),
-            //                   content: const Text(
-            //                     "A QwID egy olyan fiók, mellyel az összes QwIT szolgáltatásba beléphetsz és minden adatod egy helyen kezelheted. \"Miért jó ez nekem?\" A QwID fiókba való bejelentkezéssel rengeteg új funkcióhoz férhetsz hozzá, ami sajnos korábban lehetetlen volt egy szimpla e-KRÉTA fiókkal. Fiókhoz kötve megoszthatsz bármilyen adatot a barátaiddal, vagy ha szeretnéd nyilvánosságra is hozhatod jegyeid, reFilc témáid, és még rengeteg dolgot. A QwID fiók abban is segít, hogy egyszerűbben kezelhesd előfizetéseid, valamint fiókodnak köszönhetően rengeteg ajándékot kaphatsz reFilc+ előfizetésed mellé egyéb QwIT és reFilc szolgáltatásokban. \"Miért QwID?\" A név a reFilc mögött álló fejlesztői csapat, a QwIT nevéből, valamint az angol Identity szó rövidítéséből ered. \"Egyéb hasznos tudnivalók?\" A QwID fiókodat bármikor törölheted, ha úgy érzed, hogy nem szeretnéd tovább használni. Bővebb információt az adatkezelésről és az általános feltételekről megtalálsz a regisztrációs oldalon. Fiókod kezeléséhez látogass el a qwid.qwit.dev weboldalra.",
-            //                   ),
-            //                   actions: [
-            //                     TextButton(
-            //                       onPressed: () {
-            //                         Navigator.of(context).pop();
-            //                       },
-            //                       child: const Text("Szuper!"),
-            //                     ),
-            //                   ],
-            //                 );
-            //               },
-            //             );
-            //           },
-            //           child: Icon(
-            //             FeatherIcons.helpCircle,
-            //             size: 20.0,
-            //             color: AppColors.of(context).text.withOpacity(0.95),
-            //           ),
-            //         ),
-            //         borderRadius: const BorderRadius.vertical(
-            //           top: Radius.circular(12.0),
-            //           bottom: Radius.circular(4.0),
-            //         ),
-            //       ),
-            //     ],
-            //   ),
-            // ),
-
-            // settings submenus
-            const SizedBox(
-              height: 16.0,
-            ),
-            Panel(
-              hasShadow: false,
-              padding:
-                  const EdgeInsets.only(bottom: 20.0, left: 24.0, right: 24.0),
-              title: Padding(
-                padding: const EdgeInsets.only(left: 24.0),
-                child: Text('settings'.i18n),
-              ),
-              isTransparent: true,
-              child: Column(
-                children: [
-                  // general settings
-                  const SplittedPanel(
-                    padding: EdgeInsets.zero,
-                    cardPadding: EdgeInsets.all(4.0),
-                    children: [
-                      MenuGeneralSettings(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(12.0),
-                          bottom: Radius.circular(12.0),
-                        ),
-                      ),
+                  ),*/
                     ],
                   ),
 
-                  // theme settings
+                if ((user.gradeStreak ?? 0) > 1)
                   SplittedPanel(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    cardPadding: const EdgeInsets.all(4.0),
+                    padding: const EdgeInsets.only(
+                        bottom: 12.0, left: 24.0, right: 24.0),
                     children: [
-                      const MenuPersonalizeSettings(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(12.0),
-                          bottom: Radius.circular(4.0),
-                        ),
-                      ),
-                      PanelButton(
-                        onPressed: () {
-                          SettingsHelper.theme(context);
-                          setState(() {});
+                      GestureDetector(
+                        onTap: () {
+                          SoonAlert.show(context: context);
                         },
-                        title: Text("theme".i18n),
-                        leading: Icon(
-                          FeatherIcons.sun,
-                          size: 22.0,
-                          color: AppColors.of(context).text.withOpacity(0.95),
-                        ),
-                        trailing: Text(
-                          themeModeText,
-                          style: const TextStyle(fontSize: 14.0),
-                        ),
-                        borderRadius: const BorderRadius.vertical(
-                          top: Radius.circular(4.0),
-                          bottom: Radius.circular(12.0),
+                        child: ListTile(
+                          title: Text(
+                            "grade_streak".i18n,
+                            style: TextStyle(
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(0.95),
+                              fontWeight: FontWeight.w500,
+                            ),
+                          ),
+                          subtitle: Text(
+                            "grade_streak_subtitle".i18n,
+                            style: TextStyle(
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(0.75),
+                            ),
+                          ),
+                          leading: Image.asset(
+                            'assets/images/apple_fire_emoji.png',
+                            width: 24.0,
+                          ),
+                          // leading: const Text(
+                          //   "🔥",
+                          //   style: TextStyle(fontSize: 22.0),
+                          // ),
+                          trailing: Text(
+                            "${user.gradeStreak}",
+                            style: TextStyle(
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(0.95),
+                              fontWeight: FontWeight.w500,
+                              fontSize: 18.0,
+                            ),
+                          ),
                         ),
                       ),
                     ],
                   ),
 
-                  // notifications
-                  const SplittedPanel(
-                    padding: EdgeInsets.only(top: 8.0),
-                    cardPadding: EdgeInsets.all(4.0),
-                    children: [
-                      MenuNotifications(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(12.0),
-                          bottom: Radius.circular(12.0),
-                        ),
-                      ),
-                    ],
-                  ),
+                // plus subscribe inline
+                const PlusSettingsInline(),
 
-                  // extras
-                  const SplittedPanel(
-                    padding: EdgeInsets.only(top: 8.0),
-                    cardPadding: EdgeInsets.all(4.0),
-                    children: [
-                      MenuExtrasSettings(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(12.0),
-                          bottom: Radius.circular(12.0),
-                        ),
-                      ),
-                    ],
-                  ),
-                  // const SplittedPanel(
-                  //   padding: EdgeInsets.only(top: 8.0),
-                  //   cardPadding: EdgeInsets.all(4.0),
-                  //   children: [
-                  //     MenuOtherSettings(
-                  //       borderRadius: BorderRadius.vertical(
-                  //         top: Radius.circular(12.0),
-                  //         bottom: Radius.circular(12.0),
-                  //       ),
-                  //     ),
-                  //   ],
-                  // ),
-                ],
-              ),
-            ),
+                // const SizedBox(
+                //   height: 16.0,
+                // ),
 
-            // // icon gallery (debug mode)
-            if (kDebugMode)
-              Padding(
-                padding: const EdgeInsets.only(
-                    bottom: 16.0, left: 24.0, right: 24.0),
-                child: Panel(
-                  title: const Text("Debug"),
+                // Panel(
+                //   hasShadow: false,
+                //   padding: const EdgeInsets.only(left: 24.0, right: 24.0),
+                //   title: Padding(
+                //     padding: const EdgeInsets.only(left: 24.0),
+                //     child: Text('account_link'.i18n),
+                //   ),
+                //   isTransparent: true,
+                //   child: Column(
+                //     children: [
+                //       // QwID account linking
+                //       PanelButton(
+                //         onPressed: () {
+                //           launchUrl(
+                //             Uri.parse(
+                //                 'https://qwid.qwit.dev/oauth2/authorize?client_id=refilc&response_type=code&scope=*'),
+                //             mode: LaunchMode.externalApplication,
+                //           );
+                //         },
+                //         title: Text("QwID fiók-összekapcsolás".i18n),
+                //         leading: Icon(
+                //           FeatherIcons.link,
+                //           size: 22.0,
+                //           color: AppColors.of(context).text.withOpacity(0.95),
+                //         ),
+                //         trailing: GestureDetector(
+                //           onTap: () {
+                //             showDialog(
+                //               context: context,
+                //               builder: (BuildContext context) {
+                //                 return AlertDialog(
+                //                   title: const Text("QwID?!"),
+                //                   content: const Text(
+                //                     "A QwID egy olyan fiók, mellyel az összes QwIT szolgáltatásba beléphetsz és minden adatod egy helyen kezelheted. \"Miért jó ez nekem?\" A QwID fiókba való bejelentkezéssel rengeteg új funkcióhoz férhetsz hozzá, ami sajnos korábban lehetetlen volt egy szimpla e-KRÉTA fiókkal. Fiókhoz kötve megoszthatsz bármilyen adatot a barátaiddal, vagy ha szeretnéd nyilvánosságra is hozhatod jegyeid, reFilc témáid, és még rengeteg dolgot. A QwID fiók abban is segít, hogy egyszerűbben kezelhesd előfizetéseid, valamint fiókodnak köszönhetően rengeteg ajándékot kaphatsz reFilc+ előfizetésed mellé egyéb QwIT és reFilc szolgáltatásokban. \"Miért QwID?\" A név a reFilc mögött álló fejlesztői csapat, a QwIT nevéből, valamint az angol Identity szó rövidítéséből ered. \"Egyéb hasznos tudnivalók?\" A QwID fiókodat bármikor törölheted, ha úgy érzed, hogy nem szeretnéd tovább használni. Bővebb információt az adatkezelésről és az általános feltételekről megtalálsz a regisztrációs oldalon. Fiókod kezeléséhez látogass el a qwid.qwit.dev weboldalra.",
+                //                   ),
+                //                   actions: [
+                //                     TextButton(
+                //                       onPressed: () {
+                //                         Navigator.of(context).pop();
+                //                       },
+                //                       child: const Text("Szuper!"),
+                //                     ),
+                //                   ],
+                //                 );
+                //               },
+                //             );
+                //           },
+                //           child: Icon(
+                //             FeatherIcons.helpCircle,
+                //             size: 20.0,
+                //             color: AppColors.of(context).text.withOpacity(0.95),
+                //           ),
+                //         ),
+                //         borderRadius: const BorderRadius.vertical(
+                //           top: Radius.circular(12.0),
+                //           bottom: Radius.circular(4.0),
+                //         ),
+                //       ),
+                //     ],
+                //   ),
+                // ),
+
+                // settings submenus
+                const SizedBox(
+                  height: 16.0,
+                ),
+                Panel(
+                  hasShadow: false,
+                  padding:
+                  const EdgeInsets.only(bottom: 20.0, left: 24.0, right: 24.0),
+                  title: Padding(
+                    padding: const EdgeInsets.only(left: 24.0),
+                    child: Text('settings'.i18n),
+                  ),
+                  isTransparent: true,
                   child: Column(
                     children: [
-                      PanelButton(
-                        title: const Text("Subject Icon Gallery"),
-                        leading:
-                            const Icon(CupertinoIcons.rectangle_3_offgrid_fill),
-                        trailing: const Icon(Icons.arrow_forward),
-                        onPressed: () {
-                          Navigator.of(context, rootNavigator: true).push(
-                            CupertinoPageRoute(
-                                builder: (context) =>
-                                    const SubjectIconGallery()),
-                          );
-                        },
-                      )
+                      // general settings
+                      const SplittedPanel(
+                        padding: EdgeInsets.zero,
+                        cardPadding: EdgeInsets.all(4.0),
+                        children: [
+                          MenuGeneralSettings(
+                            borderRadius: BorderRadius.vertical(
+                              top: Radius.circular(12.0),
+                              bottom: Radius.circular(12.0),
+                            ),
+                          ),
+                        ],
+                      ),
+
+                      // theme settings
+                      SplittedPanel(
+                        padding: const EdgeInsets.only(top: 8.0),
+                        cardPadding: const EdgeInsets.all(4.0),
+                        children: [
+                          const MenuPersonalizeSettings(
+                            borderRadius: BorderRadius.vertical(
+                              top: Radius.circular(12.0),
+                              bottom: Radius.circular(4.0),
+                            ),
+                          ),
+                          PanelButton(
+                            onPressed: () {
+                              SettingsHelper.theme(context);
+                              setState(() {});
+                            },
+                            title: Text("theme".i18n),
+                            leading: Icon(
+                              FeatherIcons.sun,
+                              size: 22.0,
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(0.95),
+                            ),
+                            trailing: Text(
+                              themeModeText,
+                              style: const TextStyle(fontSize: 14.0),
+                            ),
+                            borderRadius: const BorderRadius.vertical(
+                              top: Radius.circular(4.0),
+                              bottom: Radius.circular(12.0),
+                            ),
+                          ),
+                        ],
+                      ),
+
+                      // notifications
+                      const SplittedPanel(
+                        padding: EdgeInsets.only(top: 8.0),
+                        cardPadding: EdgeInsets.all(4.0),
+                        children: [
+                          /*MenuNotifications(
+                        borderRadius: BorderRadius.vertical(
+                          top: Radius.circular(12.0),
+                          bottom: Radius.circular(12.0),
+                        ),
+                      ),*/
+                        ],
+                      ),
+
+                      // extras
+                      const SplittedPanel(
+                        padding: EdgeInsets.only(top: 8.0),
+                        cardPadding: EdgeInsets.all(4.0),
+                        children: [
+                          MenuExtrasSettings(
+                            borderRadius: BorderRadius.vertical(
+                              top: Radius.circular(12.0),
+                              bottom: Radius.circular(12.0),
+                            ),
+                          ),
+                        ],
+                      ),
+                      // const SplittedPanel(
+                      //   padding: EdgeInsets.only(top: 8.0),
+                      //   cardPadding: EdgeInsets.all(4.0),
+                      //   children: [
+                      //     MenuOtherSettings(
+                      //       borderRadius: BorderRadius.vertical(
+                      //         top: Radius.circular(12.0),
+                      //         bottom: Radius.circular(12.0),
+                      //       ),
+                      //     ),
+                      //   ],
+                      // ),
                     ],
                   ),
                 ),
-              ),
 
-            // other secion
-            SplittedPanel(
-              title: Text("other".i18n),
-              cardPadding: const EdgeInsets.all(4.0),
-              children: [
-                PanelButton(
-                  leading: Icon(
-                    Icons.qr_code,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("qr_scanner".i18n),
-                  onPressed: () => Navigator.of(context).push(
-                    MaterialPageRoute(
-                      builder: (context) => const CodeScannerScreen(),
+                // // icon gallery (debug mode)
+                if (kDebugMode)
+                  Padding(
+                    padding: const EdgeInsets.only(
+                        bottom: 16.0, left: 24.0, right: 24.0),
+                    child: Panel(
+                      title: const Text("Debug"),
+                      child: Column(
+                        children: [
+                          PanelButton(
+                            title: const Text("Subject Icon Gallery"),
+                            leading:
+                            const Icon(CupertinoIcons.rectangle_3_offgrid_fill),
+                            trailing: const Icon(Icons.arrow_forward),
+                            onPressed: () {
+                              Navigator.of(context, rootNavigator: true).push(
+                                CupertinoPageRoute(
+                                    builder: (context) =>
+                                    const SubjectIconGallery()),
+                              );
+                            },
+                          )
+                        ],
+                      ),
                     ),
                   ),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(12.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.mail,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("news".i18n),
-                  onPressed: () => _openNews(context),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.map,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("stickermap".i18n),
-                  onPressed: () => launchUrl(
-                    Uri.parse("https://stickermap.refilc.hu"),
-                    mode: LaunchMode.inAppBrowserView,
-                  ),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(12.0),
-                  ),
-                ),
-              ],
-            ),
 
-            // // extra settings
-            // Padding(
-            //   padding:
-            //       const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
-            //   child: Panel(
-            //     title: Text("extras".i18n),
-            //     child: Column(
-            //       children: [
-            //         PremiumCustomAppIconMenu(
-            //           settings: settings,
-            //         ),
-            //         // PanelButton(
-            //         //   onPressed: () {
-            //         //     SoonAlert.show(context: context);
-            //         //   },
-            //         //   title: Text('app_icon'.i18n),
-            //         //   leading: const Icon(FeatherIcons.edit),
-            //         //   // trailing: Text(
-            //         //   //   'default'.i18n,
-            //         //   //   style: const TextStyle(fontSize: 14.0),
-            //         //   // ),
-            //         // ),
-            //       ],
-            //     ),
-            //   ),
-            // ),
+                // other secion
+                SplittedPanel(
+                  title: Text("other".i18n),
+                  cardPadding: const EdgeInsets.all(4.0),
+                  children: [
+                    PanelButton(
+                      leading: Icon(
+                        FeatherIcons.mail,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: Text("news".i18n),
+                      onPressed: () => _openNews(context),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(4.0),
+                        bottom: Radius.circular(4.0),
+                      ),
+                    ),
+                    PanelButton(
+                      leading: Icon(
+                        FeatherIcons.map,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: Text("stickermap".i18n),
+                      onPressed: () =>
+                          launchUrl(
+                            Uri.parse("https://map.qwit.cloud"),
+                            mode: LaunchMode.inAppBrowserView,
+                          ),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(4.0),
+                        bottom: Radius.circular(12.0),
+                      ),
+                    ),
+                  ],
+                ),
 
-            // about sweetie
-            SplittedPanel(
-              title: Text("about".i18n),
-              cardPadding: const EdgeInsets.all(4.0),
-              children: [
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.lock,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("privacy".i18n),
-                  // onPressed: () => launchUrl(
-                  //     Uri.parse("https://refilc.hu/privacy-policy"),
-                  //     mode: LaunchMode.inAppWebView),
-                  onPressed: () => _openPrivacy(context),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(12.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.atSign,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: const Text("Discord"),
-                  onPressed: () => launchUrl(Uri.parse("https://dc.refilc.hu"),
-                      mode: LaunchMode.externalApplication),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                PanelButton(
+                // // extra settings
+                // Padding(
+                //   padding:
+                //       const EdgeInsets.symmetric(vertical: 12.0, horizontal: 24.0),
+                //   child: Panel(
+                //     title: Text("extras".i18n),
+                //     child: Column(
+                //       children: [
+                //         PremiumCustomAppIconMenu(
+                //           settings: settings,
+                //         ),
+                //         // PanelButton(
+                //         //   onPressed: () {
+                //         //     SoonAlert.show(context: context);
+                //         //   },
+                //         //   title: Text('app_icon'.i18n),
+                //         //   leading: const Icon(FeatherIcons.edit),
+                //         //   // trailing: Text(
+                //         //   //   'default'.i18n,
+                //         //   //   style: const TextStyle(fontSize: 14.0),
+                //         //   // ),
+                //         // ),
+                //       ],
+                //     ),
+                //   ),
+                // ),
+
+                // about sweetie
+                SplittedPanel(
+                  title: Text("about".i18n),
+                  cardPadding: const EdgeInsets.all(4.0),
+                  children: [
+                    PanelButton(
+                      leading: Icon(
+                        FeatherIcons.lock,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: Text("privacy".i18n),
+                      onPressed: () => _openPrivacy(context),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(12.0),
+                        bottom: Radius.circular(4.0),
+                      ),
+                    ),
+                    PanelButton(
+                      leading: Icon(
+                        FeatherIcons.atSign,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: const Text("Discord"),
+                      onPressed: () =>
+                          launchUrl(Uri.parse("https://discord.gg/6DvjyPAw2T"),
+                              mode: LaunchMode.externalApplication),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(4.0),
+                        bottom: Radius.circular(4.0),
+                      ),
+                    ),
+                    /*PanelButton(
                   leading: Icon(
                     FeatherIcons.globe,
                     size: 22.0,
@@ -1143,305 +1219,354 @@ class SettingsScreenState extends State<SettingsScreen>
                     top: Radius.circular(4.0),
                     bottom: Radius.circular(4.0),
                   ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.github,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: const Text("Github"),
-                  onPressed: () => launchUrl(
-                      Uri.parse("https://github.com/refilc"),
-                      mode: LaunchMode.externalApplication),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    FeatherIcons.award,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("licenses".i18n),
-                  onPressed: () => showLicensePage(context: context),
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(4.0),
-                  ),
-                ),
-                Tooltip(
-                  message: "data_collected".i18n,
-                  padding: const EdgeInsets.all(4.0),
-                  margin: const EdgeInsets.all(10.0),
-                  textStyle: TextStyle(
-                      fontWeight: FontWeight.w500,
-                      color: AppColors.of(context).text),
-                  decoration: BoxDecoration(
-                    color: Theme.of(context).colorScheme.surface,
-                    borderRadius: BorderRadius.circular(12.0),
-                    boxShadow: [
-                      BoxShadow(
-                        color: Colors.black.withOpacity(0.2),
-                        blurRadius: 40.0,
-                      )
-                    ],
-                  ),
-                  child: Material(
-                    type: MaterialType.transparency,
-                    child: SwitchListTile(
-                      contentPadding:
-                          const EdgeInsets.only(left: 14.0, right: 4.0),
-                      shape: const RoundedRectangleBorder(
-                        borderRadius: BorderRadius.vertical(
-                          top: Radius.circular(4.0),
-                          bottom: Radius.circular(4.0),
-                        ),
-                      ),
-                      secondary: Icon(
-                        FeatherIcons.barChart2,
-                        size: 22.0,
-                        color: settings.analyticsEnabled
-                            ? AppColors.of(context).text.withOpacity(0.95)
-                            : AppColors.of(context).text.withOpacity(.25),
-                      ),
-                      title: Text(
-                        "Analytics".i18n,
-                        style: TextStyle(
-                          fontWeight: FontWeight.w600,
-                          fontSize: 16.0,
-                          color: AppColors.of(context).text.withOpacity(
-                              settings.analyticsEnabled ? 1.0 : .5),
-                        ),
-                      ),
-                      subtitle: Text(
-                        "Anonymous Usage Analytics".i18n,
-                        style: TextStyle(
-                          color: AppColors.of(context)
-                              .text
-                              .withOpacity(settings.analyticsEnabled ? .5 : .2),
-                        ),
-                      ),
-                      onChanged: (v) {
-                        // String newId;
-                        // if (v == false) {
-                        //   newId = "none";
-                        // } else if (settings.xFilcId == "none") {
-                        //   newId = SettingsProvider.defaultSettings().xFilcId;
-                        // } else {
-                        //   newId = settings.xFilcId;
-                        // }
-                        settings.update(analyticsEnabled: v);
-                      },
-                      value: settings.analyticsEnabled,
-                      activeColor: Theme.of(context).colorScheme.secondary,
-                    ),
-                  ),
-                ),
-                PanelButton(
-                  leading: Icon(
-                    Icons.feedback_outlined,
-                    size: 22.0,
-                    color: AppColors.of(context).text.withOpacity(0.95),
-                  ),
-                  title: Text("feedback".i18n),
-                  onPressed: () => {
-                    Shake.setScreenshotIncluded(false),
-                    Shake.show(ShakeScreen.newTicket),
-                    Shake.setScreenshotIncluded(true),
-                  },
-                  borderRadius: const BorderRadius.vertical(
-                    top: Radius.circular(4.0),
-                    bottom: Radius.circular(12.0),
-                  ),
-                ),
-              ],
-            ),
-
-            if (kDebugMode)
-              SplittedPanel(
-                title: const Text("debug_settings"),
-                cardPadding: const EdgeInsets.all(4.0),
-                children: [
-                  PanelButton(
-                    title: const Text('loginToGoogle'),
-                    onPressed: () async {
-                      ThirdPartyProvider tpp = Provider.of<ThirdPartyProvider>(
-                          context,
-                          listen: false);
-
-                      await tpp.googleSignIn();
-                    },
-                  ),
-                  PanelButton(
-                    title: const Text('pushTimetableToCalendar'),
-                    onPressed: () async {},
-                  ),
-                  PanelButton(
-                    title: const Text('resetNewBadges'),
-                    onPressed: () async {
-                      Provider.of<SettingsProvider>(context, listen: false)
-                          .update(
-                        unseenNewFeatures: ['grade_exporting'],
-                      );
-                    },
-                  ),
-                ],
-              ),
-            // developer options
-            if (settings.developerMode)
-              SplittedPanel(
-                title: Text("devsettings".i18n),
-                cardPadding: const EdgeInsets.all(4.0),
-                children: [
-                  Material(
-                    type: MaterialType.transparency,
-                    child: SwitchListTile(
-                      contentPadding:
-                          const EdgeInsets.only(left: 12.0, right: 4.0),
-                      shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.vertical(
-                              top: Radius.circular(12.0),
-                              bottom: Radius.circular(4.0))),
-                      title: Text("devmode".i18n,
-                          style: const TextStyle(fontWeight: FontWeight.w500)),
-                      onChanged: (v) => settings.update(developerMode: false),
-                      value: settings.developerMode,
-                      activeColor: Theme.of(context).colorScheme.secondary,
-                    ),
-                  ),
-                  PanelButton(
-                    borderRadius: const BorderRadius.vertical(
-                      top: Radius.circular(4.0),
-                      bottom: Radius.circular(4.0),
-                    ),
-                    leading: Icon(
-                      Icons.tune_outlined,
-                      size: 22.0,
-                      color: AppColors.of(context).text.withOpacity(.95),
-                    ),
-                    title: Text("exp_settings".i18n),
-                    onPressed: () => Clipboard.setData(ClipboardData(
-                      text: json.encode(settings.toMap()),
-                    )),
-                  ),
-                  PanelButton(
-                    borderRadius: BorderRadius.vertical(
-                      top: const Radius.circular(4.0),
-                      bottom: Provider.of<PlusProvider>(context, listen: false)
-                              .hasPremium
-                          ? const Radius.circular(4.0)
-                          : const Radius.circular(12.0),
-                    ),
-                    leading: Icon(
-                      FeatherIcons.copy,
-                      size: 22.0,
-                      color: AppColors.of(context).text.withOpacity(.95),
-                    ),
-                    title: Text("copy_jwt".i18n),
-                    onPressed: () => Clipboard.setData(ClipboardData(
-                        text: Provider.of<KretaClient>(context, listen: false)
-                            .accessToken!)),
-                  ),
-                  if (Provider.of<PlusProvider>(context, listen: false)
-                      .hasPremium)
+                ),*/
                     PanelButton(
+                      leading: Icon(
+                        FeatherIcons.github,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: const Text("Gitea"),
+                      onPressed: () =>
+                          launchUrl(
+                              Uri.parse(
+                                  "https://git.qwit.cloud/refilc/student-legacy"),
+                              mode: LaunchMode.externalApplication),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(4.0),
+                        bottom: Radius.circular(4.0),
+                      ),
+                    ),
+                    PanelButton(
+                      leading: Icon(
+                        FeatherIcons.award,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: Text("licenses".i18n),
+                      onPressed: () => showLicensePage(context: context),
+                      borderRadius: const BorderRadius.vertical(
+                        top: Radius.circular(4.0),
+                        bottom: Radius.circular(4.0),
+                      ),
+                    ),
+                    Tooltip(
+                      message: "data_collected".i18n,
+                      padding: const EdgeInsets.all(4.0),
+                      margin: const EdgeInsets.all(10.0),
+                      textStyle: TextStyle(
+                          fontWeight: FontWeight.w500,
+                          color: AppColors
+                              .of(context)
+                              .text),
+                      decoration: BoxDecoration(
+                        color: Theme
+                            .of(context)
+                            .colorScheme
+                            .surface,
+                        borderRadius: BorderRadius.circular(12.0),
+                        boxShadow: [
+                          BoxShadow(
+                            color: Colors.black.withOpacity(0.2),
+                            blurRadius: 40.0,
+                          )
+                        ],
+                      ),
+                      child: Material(
+                        type: MaterialType.transparency,
+                        child: SwitchListTile(
+                          contentPadding:
+                          const EdgeInsets.only(left: 14.0, right: 4.0),
+                          shape: const RoundedRectangleBorder(
+                            borderRadius: BorderRadius.vertical(
+                              top: Radius.circular(4.0),
+                              bottom: Radius.circular(4.0),
+                            ),
+                          ),
+                          secondary: Icon(
+                            FeatherIcons.barChart2,
+                            size: 22.0,
+                            color: settings.analyticsEnabled
+                                ? AppColors
+                                .of(context)
+                                .text
+                                .withOpacity(0.95)
+                                : AppColors
+                                .of(context)
+                                .text
+                                .withOpacity(.25),
+                          ),
+                          title: Text(
+                            "Analytics".i18n,
+                            style: TextStyle(
+                              fontWeight: FontWeight.w600,
+                              fontSize: 16.0,
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(
+                                  settings.analyticsEnabled ? 1.0 : .5),
+                            ),
+                          ),
+                          subtitle: Text(
+                            "Anonymous Usage Analytics".i18n,
+                            style: TextStyle(
+                              color: AppColors
+                                  .of(context)
+                                  .text
+                                  .withOpacity(
+                                  settings.analyticsEnabled ? .5 : .2),
+                            ),
+                          ),
+                          onChanged: (v) {
+                            // String newId;
+                            // if (v == false) {
+                            //   newId = "none";
+                            // } else if (settings.xFilcId == "none") {
+                            //   newId = SettingsProvider.defaultSettings().xFilcId;
+                            // } else {
+                            //   newId = settings.xFilcId;
+                            // }
+                            settings.update(analyticsEnabled: v);
+                          },
+                          value: settings.analyticsEnabled,
+                          activeColor: Theme
+                              .of(context)
+                              .colorScheme
+                              .secondary,
+                        ),
+                      ),
+                    ),
+                    PanelButton(
+                      leading: Icon(
+                        Icons.feedback_outlined,
+                        size: 22.0,
+                        color: AppColors
+                            .of(context)
+                            .text
+                            .withOpacity(0.95),
+                      ),
+                      title: Text("feedback".i18n),
+                      onPressed: () =>
+                      {
+                        Shake.setScreenshotIncluded(false),
+                        Shake.show(ShakeScreen.newTicket),
+                        Shake.setScreenshotIncluded(true),
+                      },
                       borderRadius: const BorderRadius.vertical(
                         top: Radius.circular(4.0),
                         bottom: Radius.circular(12.0),
                       ),
-                      leading: Icon(
-                        FeatherIcons.key,
-                        size: 22.0,
-                        color: AppColors.of(context).text.withOpacity(.95),
+                    ),
+                  ],
+                ),
+
+                if (kDebugMode)
+                  SplittedPanel(
+                    title: const Text("debug_settings"),
+                    cardPadding: const EdgeInsets.all(4.0),
+                    children: [
+                      PanelButton(
+                        title: const Text('loginToGoogle'),
+                        onPressed: () async {
+                          ThirdPartyProvider tpp = Provider.of<
+                              ThirdPartyProvider>(
+                              context,
+                              listen: false);
+
+                          await tpp.googleSignIn();
+                        },
                       ),
-                      title: const Text("Remove Premium"),
-                      onPressed: () {
-                        Provider.of<PlusProvider>(context, listen: false)
-                            .activate(removePremium: true);
-                        settings.update(
-                            accentColor: AccentColor.filc, store: true);
-                        Provider.of<ThemeModeObserver>(context, listen: false)
-                            .changeTheme(settings.theme);
+                      PanelButton(
+                        title: const Text('pushTimetableToCalendar'),
+                        onPressed: () async {},
+                      ),
+                      PanelButton(
+                        title: const Text('resetNewBadges'),
+                        onPressed: () async {
+                          Provider.of<SettingsProvider>(context, listen: false)
+                              .update(
+                            unseenNewFeatures: ['grade_exporting'],
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                // developer options
+                if (true)
+                  SplittedPanel(
+                    title: Text("devsettings".i18n),
+                    cardPadding: const EdgeInsets.all(4.0),
+                    children: [
+                      Material(
+                        type: MaterialType.transparency,
+                        child: SwitchListTile(
+                          contentPadding:
+                          const EdgeInsets.only(left: 12.0, right: 4.0),
+                          shape: const RoundedRectangleBorder(
+                              borderRadius: BorderRadius.vertical(
+                                  top: Radius.circular(12.0),
+                                  bottom: Radius.circular(4.0))),
+                          title: Text("devmode".i18n,
+                              style: const TextStyle(
+                                  fontWeight: FontWeight.w500)),
+                          onChanged: (v) =>
+                              settings.update(developerMode: false),
+                          value: settings.developerMode,
+                          activeColor: Theme
+                              .of(context)
+                              .colorScheme
+                              .secondary,
+                        ),
+                      ),
+                      PanelButton(
+                        borderRadius: const BorderRadius.vertical(
+                          top: Radius.circular(4.0),
+                          bottom: Radius.circular(4.0),
+                        ),
+                        leading: Icon(
+                          Icons.tune_outlined,
+                          size: 22.0,
+                          color: AppColors
+                              .of(context)
+                              .text
+                              .withOpacity(.95),
+                        ),
+                        title: Text("exp_settings".i18n),
+                        onPressed: () =>
+                            Clipboard.setData(ClipboardData(
+                              text: json.encode(settings.toMap()),
+                            )),
+                      ),
+                      PanelButton(
+                        borderRadius: BorderRadius.vertical(
+                          top: const Radius.circular(4.0),
+                          bottom: Provider
+                              .of<PlusProvider>(context, listen: false)
+                              .hasPremium
+                              ? const Radius.circular(4.0)
+                              : const Radius.circular(12.0),
+                        ),
+                        leading: Icon(
+                          FeatherIcons.copy,
+                          size: 22.0,
+                          color: AppColors
+                              .of(context)
+                              .text
+                              .withOpacity(.95),
+                        ),
+                        title: Text("copy_jwt".i18n),
+                        onPressed: () =>
+                            Clipboard.setData(ClipboardData(
+                                text: Provider
+                                    .of<KretaClient>(context, listen: false)
+                                    .accessToken!)),
+                      ),
+                      if (Provider
+                          .of<PlusProvider>(context, listen: false)
+                          .hasPremium)
+                        PanelButton(
+                          borderRadius: const BorderRadius.vertical(
+                            top: Radius.circular(4.0),
+                            bottom: Radius.circular(12.0),
+                          ),
+                          leading: Icon(
+                            FeatherIcons.key,
+                            size: 22.0,
+                            color: AppColors
+                                .of(context)
+                                .text
+                                .withOpacity(.95),
+                          ),
+                          title: const Text("Remove Premium"),
+                          onPressed: () {
+                            Provider.of<PlusProvider>(context, listen: false)
+                                .activate(removePremium: true);
+                            settings.update(
+                                accentColor: AccentColor.filc, store: true);
+                            Provider.of<ThemeModeObserver>(
+                                context, listen: false)
+                                .changeTheme(settings.theme);
+                          },
+                        ),
+                    ],
+                  ),
+
+                // version info
+                SafeArea(
+                  top: false,
+                  child: Center(
+                    child: GestureDetector(
+                      child: FutureBuilder<Map>(
+                        future: futureRelease,
+                        builder: (context, release) {
+                          String versionText;
+                          if (release.hasData && release.data != null) {
+                            versionText = "v${release
+                                .data!['version']}, modosítva a Filc csapat által";
+                          } else {
+                            versionText =
+                            "reFilc, modosítva a Filc csapat által";
+                          }
+                          return DefaultTextStyle(
+                            style: Theme
+                                .of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                                fontWeight: FontWeight.w600,
+                                color: AppColors
+                                    .of(context)
+                                    .text
+                                    .withOpacity(0.65)),
+                            child: Text(versionText),
+                          );
+                        },
+                      ),
+                      onTap: () {
+                        if (devmodeCountdown > 0) {
+                          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                            duration: const Duration(milliseconds: 200),
+                            content:
+                            Text("devmoretaps".i18n.fill([devmodeCountdown])),
+                          ));
+
+                          setState(() => devmodeCountdown--);
+                        } else if (devmodeCountdown == 0) {
+                          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                            content: Text("devactivated".i18n),
+                          ));
+
+                          settings.update(developerMode: true);
+
+                          setState(() => devmodeCountdown--);
+                        }
                       },
                     ),
-                ],
-              ),
-
-            // version info
-            SafeArea(
-              top: false,
-              child: Center(
-                child: GestureDetector(
-                  child: FutureBuilder<Map>(
-                    future: futureRelease,
-                    builder: (context, release) {
-                      if (release.hasData) {
-                        return DefaultTextStyle(
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleMedium!
-                              .copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: AppColors.of(context)
-                                      .text
-                                      .withOpacity(0.65)),
-                          child: Text("v${release.data!['version']}, módosítva a Filc csapat által"),
-                        );
-                      } else {
-                        String envAppVer = const String.fromEnvironment(
-                            "APPVER",
-                            defaultValue: "?");
-                        return DefaultTextStyle(
-                          style: Theme.of(context)
-                              .textTheme
-                              .titleMedium!
-                              .copyWith(
-                                  fontWeight: FontWeight.w600,
-                                  color: AppColors.of(context)
-                                      .text
-                                      .withOpacity(0.65)),
-                          child: Text("v$envAppVer"),
-                        );
-                      }
-                    },
                   ),
-                  onTap: () {
-                    if (devmodeCountdown > 0) {
-                      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                        duration: const Duration(milliseconds: 200),
-                        content:
-                            Text("devmoretaps".i18n.fill([devmodeCountdown])),
-                      ));
-
-                      setState(() => devmodeCountdown--);
-                    } else if (devmodeCountdown == 0) {
-                      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-                        content: Text("devactivated".i18n),
-                      ));
-
-                      settings.update(developerMode: true);
-
-                      setState(() => devmodeCountdown--);
-                    }
-                  },
                 ),
-              ),
+              ],
             ),
-          ],
-        ),
-      ),
+          )
+      ,
     );
   }
 
   void _openNews(BuildContext context) =>
       Navigator.of(context, rootNavigator: true)
           .push(CupertinoPageRoute(builder: (context) => const NewsScreen()));
+
   void _openUpdates(BuildContext context) =>
       UpdateView.show(updateProvider.releases.first, context: context);
+
   void _openPrivacy(BuildContext context) => PrivacyView.show(context);
+
   // void _openNotes(BuildContext context, Map<String, bool> doneItems) async =>
   //     Navigator.of(context, rootNavigator: true).push(CupertinoPageRoute(
   //         builder: (context) => NotesScreen(
diff --git a/refilc_plus b/refilc_plus
index 478edbef..d760ad7d 160000
--- a/refilc_plus
+++ b/refilc_plus
@@ -1 +1 @@
-Subproject commit 478edbefc025f89270c345bd3b3e8ab3325a30f9
+Subproject commit d760ad7d19108b087e1c0f0b199a198bfd36aea1