diff --git a/README.md b/README.md
index 461ed4f..1411b72 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Ce dépot contient les source de cette application, modifiable par les étudiant
 
 Si vous voulez influencer le développement ? C'est très simple !
 
-Pas besoin de connaissance, il est possible d'aider simplement en proposant des améliorations ou en rapportant des bugs par mail (vergnet@etud.insa-toulouse.fr) ou sur [cette page](https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues), en vous connectant avec vos login INSA.
+Pas besoin de connaissance, il est possible d'aider simplement en proposant des améliorations ou en rapportant des bugs par mail (vergnet@etud.insa-toulouse.fr) ou sur [cette page](https://git.etud.insa-toulouse.fr/vergnet/application-amicale/issues), en vous connectant avec vos login INSA.
 
 Si vous avez assez de connaissances et vous souhaitez proposer des modification dans le code, installez l'application sur votre machine, réalisez votre modification et créez une 'pull request'.
 
diff --git a/screens/About/AboutScreen.js b/screens/About/AboutScreen.js
index c4bc463..0f2a8f1 100644
--- a/screens/About/AboutScreen.js
+++ b/screens/About/AboutScreen.js
@@ -15,7 +15,7 @@ import ThemeManager from "../../utils/ThemeManager";
 const links = {
     appstore: 'https://apps.apple.com/us/app/campus-amicale-insat/id1477722148',
     playstore: 'https://play.google.com/store/apps/details?id=fr.amicaleinsat.application',
-    git: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/README.md',
+    git: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/README.md',
     bugsMail: 'mailto:vergnet@etud.insa-toulouse.fr?' +
         'subject=' +
         '[BUG] Application Amicale INSA Toulouse' +
@@ -25,9 +25,9 @@ const links = {
         'Nature du problème :\n\n\n' +
         'Étapes pour reproduire ce pb :\n\n\n\n' +
         'Stp corrige le pb, bien cordialement.',
-    bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues',
-    changelog: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md',
-    license: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/LICENSE',
+    bugsGit: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/issues',
+    changelog: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md',
+    license: 'https://git.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/LICENSE',
     authorMail: "mailto:vergnet@etud.insa-toulouse.fr?" +
         "subject=" +
         "Application Amicale INSA Toulouse" +
diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index 6a2ef12..2980cf7 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -14,7 +14,7 @@ import DashboardItem from "../components/DashboardItem";
 
 const ICON_AMICALE = require('../assets/amicale.png');
 const NAME_AMICALE = 'Amicale INSA Toulouse';
-const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/dashboard/dashboard_data.json";
+const DATA_URL = "https://etud.insa-toulouse.fr/~amicale_app/dashboard/dashboard_data.json";
 
 const SECTIONS_ID = [
     'dashboard',
diff --git a/screens/Proximo/ProximoMainScreen.js b/screens/Proximo/ProximoMainScreen.js
index 0380f97..b8bf269 100644
--- a/screens/Proximo/ProximoMainScreen.js
+++ b/screens/Proximo/ProximoMainScreen.js
@@ -9,7 +9,7 @@ import FetchedDataSectionList from "../../components/FetchedDataSectionList";
 import ThemeManager from "../../utils/ThemeManager";
 import Touchable from "react-native-platform-touchable";
 
-const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~proximo/data/stock-v2.json";
+const DATA_URL = "https://etud.insa-toulouse.fr/~proximo/data/stock-v2.json";
 
 
 /**
@@ -23,7 +23,21 @@ export default class ProximoMainScreen extends FetchedDataSectionList {
     }
 
     static sortFinalData(a: Object, b: Object) {
-        return a.type.id - b.type.id;
+        let str1 = a.type.name.toLowerCase();
+        let str2 = b.type.name.toLowerCase();
+
+        // Make 'All' category with id -1 stick to the top
+        if (a.type.id === -1)
+            return -1;
+        if (b.type.id === -1)
+            return 1;
+
+        // Sort others by name ascending
+        if (str1 < str2)
+            return -1;
+        if (str1 > str2)
+            return 1;
+        return 0;
     }
 
     getHeaderTranslation() {
@@ -63,7 +77,7 @@ export default class ProximoMainScreen extends FetchedDataSectionList {
             let articles = fetchedData.articles;
             finalData.push({
                 type: {
-                    id: "0",
+                    id: -1,
                     name: i18n.t('proximoScreen.all'),
                     icon: 'star'
                 },
diff --git a/screens/Proxiwash/ProxiwashScreen.js b/screens/Proxiwash/ProxiwashScreen.js
index fece8ab..6a3b075 100644
--- a/screens/Proxiwash/ProxiwashScreen.js
+++ b/screens/Proxiwash/ProxiwashScreen.js
@@ -13,7 +13,7 @@ import Touchable from "react-native-platform-touchable";
 import AsyncStorageManager from "../../utils/AsyncStorageManager";
 import * as Expo from "expo";
 
-const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/washinsa/washinsa.json";
+const DATA_URL = "https://etud.insa-toulouse.fr/~amicale_app/washinsa/washinsa.json";
 
 const MACHINE_STATES = {
     "TERMINE": "0",
diff --git a/screens/SelfMenuScreen.js b/screens/SelfMenuScreen.js
index 3221b3b..b9226bd 100644
--- a/screens/SelfMenuScreen.js
+++ b/screens/SelfMenuScreen.js
@@ -7,7 +7,7 @@ import ThemeManager from "../utils/ThemeManager";
 import i18n from "i18n-js";
 import FetchedDataSectionList from "../components/FetchedDataSectionList";
 
-const DATA_URL = "https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/menu/menu_data.json";
+const DATA_URL = "https://etud.insa-toulouse.fr/~amicale_app/menu/menu_data.json";
 
 /**
  * Class defining the app's menu screen.
diff --git a/screens/Websites/AvailableRoomScreen.js b/screens/Websites/AvailableRoomScreen.js
index 04294c2..17d372c 100644
--- a/screens/Websites/AvailableRoomScreen.js
+++ b/screens/Websites/AvailableRoomScreen.js
@@ -12,8 +12,8 @@ type Props = {
 const ROOM_URL = 'http://planex.insa-toulouse.fr/salles.php';
 const PC_URL = 'http://planex.insa-toulouse.fr/sallesInfo.php';
 const BIB_URL = 'https://bibbox.insa-toulouse.fr/';
-const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/rooms/customMobile.css';
-const CUSTOM_CSS_Bib = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/rooms/customBibMobile.css';
+const CUSTOM_CSS_GENERAL = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/rooms/customMobile.css';
+const CUSTOM_CSS_Bib = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/rooms/customBibMobile.css';
 
 /**
  * Class defining the app's planex screen.
diff --git a/screens/Websites/BlueMindScreen.js b/screens/Websites/BlueMindScreen.js
index 2b8ef83..1bad89f 100644
--- a/screens/Websites/BlueMindScreen.js
+++ b/screens/Websites/BlueMindScreen.js
@@ -11,7 +11,7 @@ type Props = {
 
 const URL = 'https://etud-mel.insa-toulouse.fr/webmail/';
 
-const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/bluemind/customMobile.css';
+const CUSTOM_CSS_GENERAL = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/bluemind/customMobile.css';
 
 
 /**
diff --git a/screens/Websites/ElusEtudScreen.js b/screens/Websites/ElusEtudScreen.js
index 7da2dc9..5227c2d 100644
--- a/screens/Websites/ElusEtudScreen.js
+++ b/screens/Websites/ElusEtudScreen.js
@@ -8,7 +8,7 @@ type Props = {
 }
 
 
-const URL = 'https://srv-falcon.etud.insa-toulouse.fr/~eeinsat/';
+const URL = 'https://etud.insa-toulouse.fr/~eeinsat/';
 
 /**
  * Class defining the app's planex screen.
diff --git a/screens/Websites/EntScreen.js b/screens/Websites/EntScreen.js
index bb0f300..da0c1a7 100644
--- a/screens/Websites/EntScreen.js
+++ b/screens/Websites/EntScreen.js
@@ -11,12 +11,12 @@ type Props = {
 
 const URL = 'https://ent.insa-toulouse.fr/';
 
-const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css';
+const CUSTOM_CSS_GENERAL = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css';
 
 // let stylesheet = document.createElement('link');
 // stylesheet.type = 'text/css';
 // stylesheet.rel = 'stylesheet';
-// stylesheet.href = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css';
+// stylesheet.href = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/ent/customMobile.css';
 // let mobileSpec = document.createElement('meta');
 // mobileSpec.name = 'viewport';
 // mobileSpec.content = 'width=device-width, initial-scale=1.0';
diff --git a/screens/Websites/PlanexScreen.js b/screens/Websites/PlanexScreen.js
index ccdf9e0..ccfd8f3 100644
--- a/screens/Websites/PlanexScreen.js
+++ b/screens/Websites/PlanexScreen.js
@@ -11,8 +11,8 @@ type Props = {
 
 const PLANEX_URL = 'http://planex.insa-toulouse.fr/';
 
-const CUSTOM_CSS_GENERAL = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/planex/customMobile3.css';
-const CUSTOM_CSS_NIGHTMODE = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/custom_css/planex/customDark2.css';
+const CUSTOM_CSS_GENERAL = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/planex/customMobile3.css';
+const CUSTOM_CSS_NIGHTMODE = 'https://etud.insa-toulouse.fr/~amicale_app/custom_css/planex/customDark2.css';
 
 // // JS + JQuery functions used to remove alpha from events. Copy paste in browser console for quick testing
 // // Remove alpha from given Jquery node
diff --git a/screens/Websites/WiketudScreen.js b/screens/Websites/WiketudScreen.js
index 8a8e23e..a29a87e 100644
--- a/screens/Websites/WiketudScreen.js
+++ b/screens/Websites/WiketudScreen.js
@@ -8,7 +8,7 @@ type Props = {
 }
 
 
-const URL = 'https://www.etud.insa-toulouse.fr/wiketud';
+const URL = 'https://wiki.etud.insa-toulouse.fr/';
 
 /**
  * Class defining the app's planex screen.
diff --git a/utils/NotificationsManager.js b/utils/NotificationsManager.js
index b2c10b2..36b8b59 100644
--- a/utils/NotificationsManager.js
+++ b/utils/NotificationsManager.js
@@ -6,7 +6,7 @@ import AsyncStorageManager from "./AsyncStorageManager";
 import LocaleManager from "./LocaleManager";
 import passwords from "../passwords";
 
-const EXPO_TOKEN_SERVER = 'https://srv-falcon.etud.insa-toulouse.fr/~amicale_app/expo_notifications/save_token.php';
+const EXPO_TOKEN_SERVER = 'https://etud.insa-toulouse.fr/~amicale_app/expo_notifications/save_token.php';
 
 /**
  * Static class used to manage notifications sent to the user