diff --git a/lib/l10n/app_pa.arb b/lib/l10n/app_pa.arb
new file mode 100644
index 0000000000..5ccafe9c0b
--- /dev/null
+++ b/lib/l10n/app_pa.arb
@@ -0,0 +1,43 @@
+{
+  "friday": "ਸ਼ੁੱਕਰਵਾਰ",
+  "hellosir": "ਨਮਸਤੇ ਸਾਹਿਬ!",
+  "recentalerts": "ਤਾਜ਼ਾ ਚੇਤਾਵਨੀਆਂ",
+  "viewall": "ਸਭ ਵੇਖੋ",
+  "seefavourites": "ਪਸੰਦੀਦੇ ਵੇਖੋ",
+  "search": "ਖੋਜੋ",
+  "recenthomework": "ਤਾਜ਼ਾ ਹੋਮਵਰਕ",
+  "favourites": "ਪਸੰਦੀਦੇ",
+  "clearallfavourites": "ਸਾਰੇ ਪਸੰਦੀਦੇ ਸਾਫ਼ ਕਰੋ",
+  "hoursleft": "ਘੰਟੇ ਬਾਕੀ ਹਨ",
+  "addnewclass": "ਨਵੀਂ ਕਲਾਸ ਸ਼ਾਮਲ ਕਰੋ",
+  "mode": "ਮੋਡ",
+  "teachername": "ਅਧਿਆਪਕ ਦਾ ਨਾਮ",
+  "date": "ਤਾਰੀਖ",
+  "time": "ਸਮਾਂ",
+  "joinlink": "ਲਿੰਕ ਤੋਂ ਸ਼ਾਮਲ ਹੋਵੋ",
+  "subject": "ਵਿਸ਼ਾ",
+  "save": "ਸੰਭਾਲੋ",
+  "yourprofile": "ਤੁਹਾਡਾ ਪ੍ਰੋਫ਼ਾਈਲ",
+  "loading": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...",
+  "email": "ਈਮੇਲ",
+  "bio": "ਜੀਵਨੀ",
+  "college": "ਕਾਲਜ",
+  "course": "ਕੋਰਸ ਕਿਸਮ",
+  "departmentmajor": "ਵਿਭਾਗ",
+  "currentacademicyear": "ਮੌਜੂਦਾ ਸਿੱਖਿਆ ਸਾਲ",
+  "gender": "ਲਿੰਗ",
+  "age": "ਉਮਰ",
+  "logout": "ਲੌਗ ਆਉਟ",
+  "settings": "ਸੈਟਿੰਗਜ਼",
+  "common": "ਆਮ",
+  "language": "ਭਾਸ਼ਾ",
+  "lightmode": "ਪ੍ਰਕਾਸ਼ ਮੋਡ",
+  "notifications": "ਸੂਚਨਾਵਾਂ",
+  "notificationsdesc": "ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ",
+  "help": "ਮਦਦ",
+  "helpdesc": "ਸਵਾਲਾਂ ਲਈ ਸਾਡੇ ਮਦਦ ਮਾਡਿਊਲ ਦੇਖੋ",
+  "faqs": "ਆਮ ਸਵਾਲ",
+  "faqsdesc": "ਮੁੱਖ ਉਪਯੋਗ ਨਿਰਦੇਸ਼",
+  "supportdevelopment": "ਐਪ ਦੀ ਵਿਕਾਸ ਦਾ ਸਹਿਯੋਗ ਕਰੋ",
+  "supportdevelopmentdesc": "ਮੁਦਾਂ ਦੀ ਸਮੱਸਿਆਵਾਂ ਹੱਲ ਕਰੋ, ਬੱਗ ਦੀ ਰਿਪੋਰਟ ਕਰੋ, ਆਦਿ|"
+}
diff --git a/lib/l10n/app_te.arb b/lib/l10n/app_te.arb
deleted file mode 100644
index 416d95cd54..0000000000
--- a/lib/l10n/app_te.arb
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "friday": "శుక్రవారం",
-  "hellosir": "నమస్తే శ్రీగారు!",
-  "recentalerts": "ఇటీవల హెచ్చరికలు",
-  "viewall": "అన్నింటిని చూడండి",
-  "seefavourites": "ఇష్టపడేవారిని చూడండి",
-  "search": "శోధించు",
-  "recenthomework": "ఇటీవల హోమ్‌వర్క్",
-  "favourites": "ఇష్టమైనవి",
-  "clearallfavourites": "అన్ని ఇష్టమైనవిని తోడ్పాటు చేయి",
-  "hoursleft": "కొన్ని గంటలు మిగిలినవి",
-  "addnewclass": "కొత్త తరగతిని జోడించండి",
-  "mode": "మోడ్",
-  "teachername": "ఉపాధ్యాయుడు పేరు",
-  "date": "తేదీ",
-  "time": "సమయం",
-  "joinlink": "లింకుని చేరండి",
-  "subject": "విషయం",
-  "save": "జోడించు",
-  "yourprofile": "మీ ప్రొఫైల్",
-  "loading": "లోడ్ అవుతోంది...",
-  "email": "ఇమెయిల్",
-  "bio": "జీవనవివరణ",
-  "college": "కళాశాల",
-  "course": "కోర్సు రకం",
-  "departmentmajor": "విభాగం",
-  "currentacademicyear": "ప్రస్తుత విద్యా సంవత్సరం",
-  "gender": "లింగం",
-  "age": "వయస్సు",
-  "logout": "లాగౌట్",
-  "settings": "అమరికలు",
-  "common": "సామాన్యం",
-  "language": "భాష",
-  "lightmode": "ప్రకాశ మోడ్",
-  "notifications": "ప్రకటనలు",
-  "notificationsdesc": "యాప్ నోటిఫికేషన్‌లను ఆన్/ఆఫ్ చేయండి",
-  "help": "సహాయం",
-  "helpdesc": "ప్రశ్నల కోసం మా సహాయం మాడ్యూల్‌ను చూడండి",
-  "faqs": "సామాన్య ప్రశ్నలు",
-  "faqsdesc": "బేసిక ఉపయోగ దిశనిర్దేశాలు",
-  "supportdevelopment": "యాప్ అభివృద్ధిని మద్దతు చేయండి",
-  "supportdevelopmentdesc": "సమస్యలను పరిష్కరించండి, బగ్‌ను నమోదు చేయండి, మరియు ఇతరాలను మద్దతు చేయండి|"
-}
diff --git a/lib/localizationTexts/punjabi.dart b/lib/localizationTexts/punjabi.dart
new file mode 100644
index 0000000000..0714772cf5
--- /dev/null
+++ b/lib/localizationTexts/punjabi.dart
@@ -0,0 +1,123 @@
+import 'package:flutter/material.dart';
+
+class PunjabiTexts {
+
+  String get friday => 'ਸ਼ੁੱਕਰਵਾਰ';
+
+
+  String get hellosir => 'ਨਮਸਤੇ ਮਹੋਦਯ!';
+
+
+  String get recentalerts => 'ਤਾਜ਼ਾ ਚੇਤਾਵਨੀਆਂ';
+
+
+  String get viewall => 'ਸਭ ਵੇਖੋ';
+
+
+  String get seefavourites => 'ਪਸੰਦੀਦੇ ਵੇਖੋ';
+
+
+  String get search => 'ਖੋਜੋ';
+
+
+  String get recenthomework => 'ਤਾਜ਼ਾ ਹੋਮਵਰਕ';
+
+
+  String get favourites => 'ਪਸੰਦੀਦੇ';
+
+
+  String get clearallfavourites => 'ਸਾਰੇ ਪਸੰਦੀਦੇ ਸਾਫ਼ ਕਰੋ';
+
+
+  String get hoursleft => 'ਘੰਟੇ ਬਾਕੀ ਹਨ';
+
+
+  String get addnewclass => 'ਨਵੀਂ ਕਲਾਸ ਜੋੜੋ';
+
+
+  String get mode => 'ਮੋਡ';
+
+
+  String get teachername => 'ਅਧਿਆਪਕ ਦਾ ਨਾਮ';
+
+
+  String get date => 'ਤਾਰੀਖ';
+
+
+  String get time => 'ਸਮਾਂ';
+
+
+  String get joinlink => 'ਲਿੰਕ ਤੋਂ ਸ਼ਾਮਲ ਹੋਵੋ';
+
+
+  String get subject => 'ਵਿਸ਼ਾ';
+
+
+  String get save => 'ਸੰਭਾਲੋ';
+
+
+  String get yourprofile => 'ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ';
+
+
+  String get loading => 'ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...';
+
+
+  String get email => 'ਈਮੇਲ';
+
+
+  String get bio => 'ਜੀਵਨੀ';
+
+
+  String get college => 'ਕਾਲਜ';
+
+
+  String get course => 'ਕੋਰਸ ਪ੍ਰਕਾਰ';
+
+
+  String get departmentmajor => 'ਵਿਭਾਗ';
+
+
+  String get currentacademicyear => 'ਮੌਜੂਦਾ ਸਿੱਖਿਆ ਸਾਲ';
+
+
+  String get gender => 'ਲਿੰਗ';
+
+
+  String get age => 'ਉਮਰ';
+
+
+  String get settings => 'ਸੈਟਿੰਗਜ਼';
+
+
+  String get common => 'ਆਮ';
+
+
+  String get language => 'ਭਾਸ਼ਾ';
+
+
+  String get lightmode => 'ਪ੍ਰਕਾਸ਼ ਮੋਡ';
+
+
+  String get notifications => 'ਸੂਚਨਾਵਾਂ';
+
+
+  String get notificationsdesc => 'ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਜਾਂ ਬੰਦ ਕਰੋ';
+
+
+  String get help => 'ਮਦਦ';
+
+
+  String get helpdesc => 'ਸਵਾਲਾਂ ਲਈ ਸਾਡੇ ਸਹਾਇਕ ਮੋਡਿਊਲ ਦੇਖੋ';
+
+
+  String get faqs => 'ਆਮ ਸਵਾਲ';
+
+
+  String get faqsdesc => 'ਬੁਨਿਆਦੀ ਉਪਯੋਗ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼';
+
+
+  String get supportdevelopment => 'ਐਪ ਦੇ ਵਿਕਾਸ ਦਾ ਸਮਰਥਨ ਕਰੋ';
+
+
+  String get supportdevelopmentdesc => 'ਸਮੱਸਿਆਵਾਂ ਦਾ ਸਮਾਧਾਨ ਕਰੋ, ਬੱਗ ਦ';
+}
diff --git a/lib/localizationTexts/telugu.dart b/lib/localizationTexts/telugu.dart
deleted file mode 100644
index a88596a15a..0000000000
--- a/lib/localizationTexts/telugu.dart
+++ /dev/null
@@ -1,123 +0,0 @@
-import 'package:flutter/material.dart';
-
-class TeluguTexts {
-
-  String get friday => 'శుక్రవారం';
-
-
-  String get hellosir => 'హలో సర్!';
-
-
-  String get recentalerts => 'ఇటీవల హెచ్చరికలు';
-
-
-  String get viewall => 'అన్నికి చూడండి';
-
-
-  String get seefavourites => 'ఇష్టమైనవారిని చూడండి';
-
-
-  String get search => 'శోధించండి';
-
-
-  String get recenthomework => 'ఇటీవల హోమ్‌వర్క్';
-
-
-  String get favourites => 'ఇష్టమైనవి';
-
-
-  String get clearallfavourites => 'అన్ని ఇష్టమైనవిలు తొలగించు';
-
-
-  String get hoursleft => 'మిగిలిన గంటలు';
-
-
-  String get addnewclass => 'కొత్త తరగతిని జోడించండి';
-
-
-  String get mode => 'మోడ్';
-
-
-  String get teachername => 'ఉపాధ్యాయుడు పేరు';
-
-
-  String get date => 'తేదీ';
-
-
-  String get time => 'సమయం';
-
-
-  String get joinlink => 'లింక్‌ను చేరండి';
-
-
-  String get subject => 'విషయం';
-
-
-  String get save => 'భద్రపరచు';
-
-
-  String get yourprofile => 'మీ ప్రొఫైల్';
-
-
-  String get loading => 'లోడ్ అవుతోంది...';
-
-
-  String get email => 'ఇమెయిల్';
-
-
-  String get bio => 'జీవనచరిత్ర';
-
-
-  String get college => 'కాలేజ్';
-
-
-  String get course => 'కోర్సు రకం';
-
-
-  String get departmentmajor => 'శాఖ';
-
-
-  String get currentacademicyear => 'ప్రస్తుత విద్యా సంవత్సరం';
-
-
-  String get gender => 'లింగం';
-
-
-  String get age => 'ప్రాయం';
-
-
-  String get settings => 'సెట్టింగులు';
-
-
-  String get common => 'సామాన్యం';
-
-
-  String get language => 'భాష';
-
-
-  String get lightmode => 'లైట్ మోడ్';
-
-
-  String get notifications => 'నోటిఫికేషన్‌లు';
-
-
-  String get notificationsdesc => 'యాప్ నోటిఫికేషన్‌లను ఆన్ లేదా ఆఫ్ చేయండి';
-
-
-  String get help => 'సహాయం';
-
-
-  String get helpdesc => 'మీ ప్రశ్నలకు మా సహాయత మాడ్యూల్‌ను చూడండి';
-
-
-  String get faqs => 'సామాన్య ప్రశ్నలు';
-
-
-  String get faqsdesc => 'మౌలిక ఉపయోగ మార్గదర్శికలు';
-
-
-  String get supportdevelopment => 'యాప్ అభివృద్ధిని మద్దతు చేయండి';
-
-
-  String get supportdevelopmentdesc => 'సమస్యలను పరిష్కరించండి, బగ్లను నివృత్తి చేయండి, మరియు మరియు|';
-}
diff --git a/lib/main.dart b/lib/main.dart
index 241bc227b9..c5900fb0e6 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -132,12 +132,12 @@ class _MyAppState extends State<MyApp> {
             GlobalWidgetsLocalizations.delegate,
             GlobalCupertinoLocalizations.delegate,
           ],
-          locale: Locale('en'),
+          locale: Locale('pa'),
           supportedLocales: [
             Locale('ru'),
             Locale('en'), // English
             Locale('hi'),
-            Locale('te')// Hindi
+            Locale('pa')// Hindi
           ],
         debugShowCheckedModeBanner: false,
         title: 'Friday',
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 04a659a976..ac14761d68 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -221,10 +221,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
                   ],
                 ),
-
-
-
-
               ],
             );
           },