diff --git a/lib/app/home/widgets/home_drawer.dart b/lib/app/home/widgets/home_drawer.dart
index 5cb19237..f0fa3697 100644
--- a/lib/app/home/widgets/home_drawer.dart
+++ b/lib/app/home/widgets/home_drawer.dart
@@ -107,7 +107,7 @@ class UserGreting extends StatelessWidget {
           style: TextStyle(
             fontWeight: FontWeight.w300,
             fontSize: 12,
-            color: Theme.of(context).colorScheme.onBackground,
+            color: AppColors.of(context).onBackground,
           ),
         ),
         if (userName == null)
@@ -116,7 +116,7 @@ class UserGreting extends StatelessWidget {
           Text(
             userName!,
             style: TextStyle(
-              color: Theme.of(context).colorScheme.onBackground,
+              color: AppColors.of(context).onBackground,
             ),
           ),
       ],
diff --git a/lib/app/transactions/form/calculator_modal.dart b/lib/app/transactions/form/calculator_modal.dart
index 70b18258..be0ba9fb 100644
--- a/lib/app/transactions/form/calculator_modal.dart
+++ b/lib/app/transactions/form/calculator_modal.dart
@@ -63,7 +63,7 @@ class _AmountSelectorState extends State<AmountSelector> {
     Color? bgColor,
     Color? textColor,
   }) {
-    textColor ??= Theme.of(context).colorScheme.onBackground;
+    textColor ??= AppColors.of(context).onBackground;
     bgColor ??= AppColors.of(context).background;
 
     onButtonPress() {
diff --git a/lib/core/database/services/currency/currency_service.dart b/lib/core/database/services/currency/currency_service.dart
index a1b0ffd7..5ee6f746 100644
--- a/lib/core/database/services/currency/currency_service.dart
+++ b/lib/core/database/services/currency/currency_service.dart
@@ -7,6 +7,8 @@ class CurrencyService {
   final _currencyTableName = 'currencies';
   final _currencyNamesTableName = 'currencyNames';
 
+  // TODO: i18n
+
   String get _baseQuery =>
       'SELECT currency.code, currency.symbol, names.es as name FROM $_currencyTableName as currency'
       ' JOIN $_currencyNamesTableName as names ON currency.code = names.currencyCode';
diff --git a/lib/core/services/filters/date_range_service.dart b/lib/core/services/filters/date_range_service.dart
index b2f1dbe1..a8641f22 100644
--- a/lib/core/services/filters/date_range_service.dart
+++ b/lib/core/services/filters/date_range_service.dart
@@ -110,7 +110,7 @@ class DateRangeService {
               if (iconText != null)
                 Container(
                   decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.onBackground,
+                      color: AppColors.of(context).onBackground,
                       borderRadius: BorderRadius.circular(4)),
                   padding:
                       const EdgeInsets.symmetric(vertical: 2, horizontal: 8),