diff --git a/.gitignore b/.gitignore
index 2305ef5c2..3a8dab385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,7 @@ android/*.keystore
 android/key.properties
 
 /settings_tiles_custom/
- 
\ No newline at end of file
+
+
+# Environment files
+.env
\ No newline at end of file
diff --git a/android/.gitignore b/android/.gitignore
index 216d3bbd6..408de972d 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -22,4 +22,5 @@ build/
 .packages
 pubspec.lock
 
-
+# Environment files
+.env
diff --git a/lib/main.dart b/lib/main.dart
index 028dfacee..291853337 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -19,6 +19,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:material_color_utilities/material_color_utilities.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import '../services/data_backup_service.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 final CorePalette paletteStartScreen = CorePalette.of(const Color.fromARGB(255, 255, 196, 0).toARGB32());
 
@@ -76,7 +77,7 @@ void main() async {
 
   
 await PreferencesHelper.init(); 
-
+ await dotenv.load(fileName: ".env");
 
   final dir = await getApplicationDocumentsDirectory();
   Hive.init(dir.path);
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index 947ea4bbf..77ac3d07a 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -1231,13 +1231,13 @@ Widget buildLayoutBlock(LayoutBlockType type) {
                       onPressed: () => handleSaveLocationView(
                         context: context,
                         updateUIState: () {
-                          // setState(() {
-                          //   isViewLocation = false;
-                          //   _isAppFullyLoaded = false;
-                          //   _istriggeredFromLocations = true;
-                          //   themeCalled = false;
-                          //   _isLoadingFroggy = true;
-                          // });
+                          setState(() {
+                            isViewLocation = false;
+                            _isAppFullyLoaded = false;
+                            _istriggeredFromLocations = true;
+                            themeCalled = false;
+                            _isLoadingFroggy = true;
+                          });
                         },
                       ),
                     style: ButtonStyle(backgroundColor: WidgetStateProperty.all(Theme.of(context).colorScheme.tertiary)),
diff --git a/lib/screens/languages_page.dart b/lib/screens/languages_page.dart
index c03b0cdbc..ba1e3444c 100644
--- a/lib/screens/languages_page.dart
+++ b/lib/screens/languages_page.dart
@@ -5,7 +5,7 @@ import '../utils/open_links.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 class LanguagesScreen extends StatefulWidget {
   const LanguagesScreen({super.key});
 
@@ -84,7 +84,7 @@ class _LanguagesScreenState extends State<LanguagesScreen> {
           FutureBuilder<Map<String, int>>(
         future: TranslationProgressService(
           projectId: '741419',
-          apiToken: '22439bfa72878c3ecb9a1b17ea8d2f9379f800b616856c4647219af7da462632fb325abd32815ace',
+          apiToken: dotenv.env['API_TOKEN']!.toString(),
         ).fetchTranslationProgress(),
         builder: (context, snapshot) {
           final progressMap = snapshot.data ?? {};
@@ -509,6 +509,7 @@ String getLanguageCodeCrodwin(Locale locale) {
     'tr', // Turkish
     'uk', // Ukrainian
     'vi', // Vietnamese
+    'ca'
   ].contains(lang)) {
     return lang;
   }
diff --git a/pubspec.lock b/pubspec.lock
index a36fc7155..b86aafa71 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -238,6 +238,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.8.1"
+  flutter_dotenv:
+    dependency: "direct main"
+    description:
+      name: flutter_dotenv
+      sha256: b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.2.1"
   flutter_lints:
     dependency: "direct dev"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index e83e383a8..06736f7c4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,7 +62,8 @@ dependencies:
   geocoding: ^4.0.0 
   solar_calculator: ^1.0.3
   file_picker: ^10.2.0
-
+  flutter_dotenv: ^5.2.1
+  
   settings_tiles:
     path: ./settings_tiles_custom