diff --git a/src/components/Overrides/CustomHTML.js b/src/components/Overrides/CustomHTML.js
index 7d88d1f..5cd6c93 100644
--- a/src/components/Overrides/CustomHTML.js
+++ b/src/components/Overrides/CustomHTML.js
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {Text, withTheme} from 'react-native-paper';
 import HTML from "react-native-render-html";
-import {Linking} from "expo";
+import {Linking} from "react-native";
 
 type Props = {
     theme: Object,
diff --git a/src/components/Screens/WebViewScreen.js b/src/components/Screens/WebViewScreen.js
index fff5538..7fcce98 100644
--- a/src/components/Screens/WebViewScreen.js
+++ b/src/components/Screens/WebViewScreen.js
@@ -7,9 +7,8 @@ import ErrorView from "./ErrorView";
 import {ERROR_TYPE} from "../../utils/WebData";
 import MaterialHeaderButtons, {Item} from '../Overrides/CustomHeaderButton';
 import {HiddenItem} from "react-navigation-header-buttons";
-import {Linking} from "expo";
 import i18n from 'i18n-js';
-import {Animated, BackHandler} from "react-native";
+import {Animated, BackHandler, Linking} from "react-native";
 import {withCollapsible} from "../../utils/withCollapsible";
 
 type Props = {
diff --git a/src/screens/Amicale/AmicaleContactScreen.js b/src/screens/Amicale/AmicaleContactScreen.js
index ddc10b1..10c817b 100644
--- a/src/screens/Amicale/AmicaleContactScreen.js
+++ b/src/screens/Amicale/AmicaleContactScreen.js
@@ -1,10 +1,9 @@
 // @flow
 
 import * as React from 'react';
-import {Animated, FlatList, Image, View} from 'react-native';
+import {Animated, FlatList, Image, Linking, View} from 'react-native';
 import {Card, List, Text, withTheme} from 'react-native-paper';
 import i18n from 'i18n-js';
-import {Linking} from "expo";
 import {Collapsible} from "react-navigation-collapsible";
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 import {withCollapsible} from "../../utils/withCollapsible";
diff --git a/src/screens/Amicale/Clubs/ClubDisplayScreen.js b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
index 19c3d7b..e1b8221 100644
--- a/src/screens/Amicale/Clubs/ClubDisplayScreen.js
+++ b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
@@ -1,7 +1,7 @@
 // @flow
 
 import * as React from 'react';
-import {ScrollView, View} from 'react-native';
+import {Linking, ScrollView, View} from 'react-native';
 import {Avatar, Button, Card, Chip, Paragraph, withTheme} from 'react-native-paper';
 import ImageModal from 'react-native-image-modal';
 import i18n from "i18n-js";
@@ -11,7 +11,6 @@ import CustomTabBar from "../../../components/Tabbar/CustomTabBar";
 import type {category, club} from "./ClubListScreen";
 import type {CustomTheme} from "../../../managers/ThemeManager";
 import {StackNavigationProp} from "@react-navigation/stack";
-import {Linking} from "expo";
 import {ERROR_TYPE} from "../../../utils/WebData";
 
 type Props = {
diff --git a/src/screens/Amicale/LoginScreen.js b/src/screens/Amicale/LoginScreen.js
index 671a2d5..fcc2404 100644
--- a/src/screens/Amicale/LoginScreen.js
+++ b/src/screens/Amicale/LoginScreen.js
@@ -1,7 +1,7 @@
 // @flow
 
 import * as React from 'react';
-import {Animated, KeyboardAvoidingView, StyleSheet, View} from "react-native";
+import {Animated, KeyboardAvoidingView, Linking, StyleSheet, View} from "react-native";
 import {Avatar, Button, Card, HelperText, Paragraph, TextInput, withTheme} from 'react-native-paper';
 import ConnectionManager from "../../managers/ConnectionManager";
 import i18n from 'i18n-js';
@@ -10,7 +10,6 @@ import {withCollapsible} from "../../utils/withCollapsible";
 import {Collapsible} from "react-navigation-collapsible";
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 import type {CustomTheme} from "../../managers/ThemeManager";
-import {Linking} from "expo";
 
 type Props = {
     navigation: Object,
diff --git a/src/screens/Home/FeedItemScreen.js b/src/screens/Home/FeedItemScreen.js
index a3c46e9..b1cd8e2 100644
--- a/src/screens/Home/FeedItemScreen.js
+++ b/src/screens/Home/FeedItemScreen.js
@@ -1,12 +1,11 @@
 // @flow
 
 import * as React from 'react';
-import {ScrollView, View} from 'react-native';
+import {Linking, ScrollView, View} from 'react-native';
 import {Avatar, Card, Text, withTheme} from 'react-native-paper';
 import ImageModal from 'react-native-image-modal';
 import Autolink from "react-native-autolink";
 import MaterialHeaderButtons, {Item} from "../../components/Overrides/CustomHeaderButton";
-import {Linking} from "expo";
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
 
 type Props = {
diff --git a/src/screens/Home/ScannerScreen.js b/src/screens/Home/ScannerScreen.js
index 2e36a34..44881ad 100644
--- a/src/screens/Home/ScannerScreen.js
+++ b/src/screens/Home/ScannerScreen.js
@@ -1,12 +1,11 @@
 // @flow
 
 import * as React from 'react';
-import {StyleSheet, View} from "react-native";
+import {Linking, StyleSheet, View} from "react-native";
 import {Button, Text, withTheme} from 'react-native-paper';
 import {BarCodeScanner} from "expo-barcode-scanner";
 import {Camera} from 'expo-camera';
 import URLHandler from "../../utils/URLHandler";
-import {Linking} from "expo";
 import AlertDialog from "../../components/Dialogs/AlertDialog";
 import i18n from 'i18n-js';
 import CustomTabBar from "../../components/Tabbar/CustomTabBar";
diff --git a/src/screens/Other/FeedbackScreen.js b/src/screens/Other/FeedbackScreen.js
index 3391d30..5c6fae9 100644
--- a/src/screens/Other/FeedbackScreen.js
+++ b/src/screens/Other/FeedbackScreen.js
@@ -3,8 +3,7 @@
 import * as React from 'react';
 import {Avatar, Button, Card, Paragraph, withTheme} from "react-native-paper";
 import i18n from "i18n-js";
-import {ScrollView} from "react-native";
-import {Linking} from "expo";
+import {Linking, ScrollView} from "react-native";
 import type {CustomTheme} from "../../managers/ThemeManager";
 
 type Props = {