diff --git a/src/App.tsx b/src/App.tsx
index d53ee58..6b61716 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,7 +1,6 @@
 import { SafeAreaView } from 'react-native'
-import {StyleSheet, Text, View, FlatList, Image} from 'react-native';
+import {StyleSheet} from 'react-native';
 import NavigationBar from "./navigation/NavigationBar";
-import Catalogue from "./screens/Catalogue";
 import {indigoColor} from "./assets/Theme";
 
 export default function App() {
diff --git a/src/components/Categ.tsx b/src/components/Categ.tsx
index 8f4b0af..c364d50 100644
--- a/src/components/Categ.tsx
+++ b/src/components/Categ.tsx
@@ -1,4 +1,4 @@
-import {StyleSheet, Text, View, FlatList, Image} from 'react-native';
+import {StyleSheet, Text, View} from 'react-native';
 import {SampleJoke} from "../model/SampleJoke";
 import {CustomJoke} from "../model/CustomJoke";
 import {greyColor} from "../assets/Theme";
diff --git a/src/components/CategList.tsx b/src/components/Categs.tsx
similarity index 90%
rename from src/components/CategList.tsx
rename to src/components/Categs.tsx
index 876e73e..369e811 100644
--- a/src/components/CategList.tsx
+++ b/src/components/Categs.tsx
@@ -7,7 +7,7 @@ type JokeListItemProps = {
     jokes: (CustomJoke | SampleJoke)[];
 };
 
-export default function CategList(props: JokeListItemProps) {
+export default function Categs(props: JokeListItemProps) {
     return (
         <FlatList showsHorizontalScrollIndicator={false} horizontal={true}
             data={props.jokes}
diff --git a/src/components/JokeItem.tsx b/src/components/JokeItem.tsx
index 9f2bd54..d8fa93b 100644
--- a/src/components/JokeItem.tsx
+++ b/src/components/JokeItem.tsx
@@ -2,6 +2,7 @@ import {StyleSheet, Text, View, Image} from 'react-native';
 import {SampleJoke} from "../model/SampleJoke";
 import {CustomJoke} from "../model/CustomJoke";
 import {darksalmonColor, whiteColor, greyColor, indigoColor} from "../assets/Theme";
+import Categ from "./Categ";
 
 type JokeListItemProps = {
     joke: (CustomJoke | SampleJoke);
@@ -15,9 +16,7 @@ export default function JokeItem(prop: JokeListItemProps) {
             <View style={styles.columnContainer}>
                 <Text style={styles.text}>Résumé de la blague</Text>
                 <Text style={styles.text}>{prop.joke.description()}</Text>
-                <View style={styles.bottomContainer}>
-                    <Text style={{color:'white'}}>{prop.joke.type}</Text>
-                </View>
+                <Categ joke={prop.joke}/>
             </View>
         </View>
     );
diff --git a/src/components/JokeListItem.tsx b/src/components/JokeItems.tsx
similarity index 89%
rename from src/components/JokeListItem.tsx
rename to src/components/JokeItems.tsx
index d9ed5ce..d25306c 100644
--- a/src/components/JokeListItem.tsx
+++ b/src/components/JokeItems.tsx
@@ -7,7 +7,7 @@ type JokeListItemProps = {
     jokes: (CustomJoke | SampleJoke)[];
 };
 
-export default function JokeListItem(props: JokeListItemProps) {
+export default function JokeItems(props: JokeListItemProps) {
     return (
         <FlatList
             data={props.jokes}
diff --git a/src/components/JokeListHomeSquare.tsx b/src/components/JokesHomeSquare.tsx
similarity index 89%
rename from src/components/JokeListHomeSquare.tsx
rename to src/components/JokesHomeSquare.tsx
index af35215..1ebbc8a 100644
--- a/src/components/JokeListHomeSquare.tsx
+++ b/src/components/JokesHomeSquare.tsx
@@ -7,7 +7,7 @@ type JokeListItemProps = {
     jokes: (CustomJoke | SampleJoke)[];
 };
 
-export default function JokeListHomeSquare(props: JokeListItemProps) {
+export default function JokesHomeSquare(props: JokeListItemProps) {
     return (
         <FlatList showsHorizontalScrollIndicator={false} horizontal={true}
             data={props.jokes}
diff --git a/src/model/Joke.ts b/src/model/Joke.ts
index 237e81b..0438c37 100644
--- a/src/model/Joke.ts
+++ b/src/model/Joke.ts
@@ -96,6 +96,9 @@ export abstract class Joke {
      * @return {string} Un résumé de la blague.
      */
     public summary(): string {
+        if(this.punchline.length <= 25){
+            return this.punchline;
+        }
         return this.punchline.substring(0, 24) + "...";
     }
 
diff --git a/src/navigation/NavigationBar.tsx b/src/navigation/NavigationBar.tsx
index ecebb18..11aa816 100644
--- a/src/navigation/NavigationBar.tsx
+++ b/src/navigation/NavigationBar.tsx
@@ -1,6 +1,6 @@
 import { NavigationContainer } from '@react-navigation/native';
 import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
-import {Image, SafeAreaView, View} from 'react-native';
+import {Image, View} from 'react-native';
 
 import HomeScreen from "../screens/HomeScreen";
 import Catalogue from "../screens/Catalogue";
@@ -8,7 +8,7 @@ import Favorites from "../screens/Favorites";
 import Add from "../screens/AddScreen";
 import Settings from "../screens/Settings";
 
-import {darksalmonColor, greyColor, indigoColor, purpleColor} from "../assets/Theme";
+import {darksalmonColor, greyColor, indigoColor} from "../assets/Theme";
 
 
 export default function NavigationBar() {
diff --git a/src/navigation/StackNavigation.tsx b/src/navigation/StackNavigation.tsx
index f1b2778..ed2a613 100644
--- a/src/navigation/StackNavigation.tsx
+++ b/src/navigation/StackNavigation.tsx
@@ -1,20 +1,20 @@
-import {createStackNavigator} from "@react-navigation/stack";
-import Accueil from "../screens/HomeScreen";
-import Catalogue from "../screens/Catalogue";
-import Add from "../screens/AddScreen";
-import Favorites from "../screens/Favorites";
-import Settings from "../screens/Settings";
-
-
-export default function StackNavigation() {
-    const Stack = createStackNavigator();
-    return (
-        <Stack.Navigator initialRouteName="Home">
-            <Stack.Screen name="Accueil" component={Accueil}/>
-            <Stack.Screen name="Catalogue" component={Catalogue}/>
-            <Stack.Screen name="Ajouter" component={Add}/>
-            <Stack.Screen name="Favoris" component={Favorites}/>
-            <Stack.Screen name="Paramètres" component={Settings}/>
-        </Stack.Navigator>
-    )
-}
\ No newline at end of file
+// import {createStackNavigator} from "@react-navigation/stack";
+// import Accueil from "../screens/HomeScreen";
+// import Catalogue from "../screens/Catalogue";
+// import Add from "../screens/AddScreen";
+// import Favorites from "../screens/Favorites";
+// import Settings from "../screens/Settings";
+//
+//
+// export default function StackNavigation() {
+//     const Stack = createStackNavigator();
+//     return (
+//         <Stack.Navigator initialRouteName="Home">
+//             <Stack.Screen name="Accueil" component={Accueil}/>
+//             <Stack.Screen name="Catalogue" component={Catalogue}/>
+//             <Stack.Screen name="Ajouter" component={Add}/>
+//             <Stack.Screen name="Favoris" component={Favorites}/>
+//             <Stack.Screen name="Paramètres" component={Settings}/>
+//         </Stack.Navigator>
+//     )
+// }
\ No newline at end of file
diff --git a/src/screens/AddScreen.tsx b/src/screens/AddScreen.tsx
index 8b65ba0..66e2488 100644
--- a/src/screens/AddScreen.tsx
+++ b/src/screens/AddScreen.tsx
@@ -1,41 +1,11 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
 import { customJokeStub } from '../data/stub/CustomJokeStub';
 import { sampleJokeStub } from '../data/stub/SampleJokeStub';
-import { SafeAreaView } from 'react-native'
-import JokeListItem from "../components/JokeListItem";
+import JokeItems from "../components/JokeItems";
 import '../types/extension';
-import {darksalmonColor, indigoColor, purpleColor} from "../assets/Theme";
 
 export default function Catalogue() {
     const allJokes = [...customJokeStub, ...sampleJokeStub];
     return (
-        <>
-            <SafeAreaView style={styles.topSafeArea}/>
-            <SafeAreaView style={styles.container}>
-                <StatusBar style="light" />
-                <JokeListItem jokes={allJokes}/>
-            </SafeAreaView>
-        </>
+        <JokeItems jokes={allJokes}/>
     )
-};
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: purpleColor,
-    },
-    centered: {
-        color:darksalmonColor,
-        fontSize:24,
-        textAlign: "center",
-        paddingBottom:20,
-    },
-    title: {
-        backgroundColor: indigoColor
-    },
-    topSafeArea: {
-        flex: 0,
-        backgroundColor: indigoColor
-    }
-});
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/screens/Catalogue.tsx b/src/screens/Catalogue.tsx
index 97dc15f..66e2488 100644
--- a/src/screens/Catalogue.tsx
+++ b/src/screens/Catalogue.tsx
@@ -1,39 +1,11 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
 import { customJokeStub } from '../data/stub/CustomJokeStub';
 import { sampleJokeStub } from '../data/stub/SampleJokeStub';
-import { SafeAreaView } from 'react-native'
-import JokeListItem from "../components/JokeListItem";
+import JokeItems from "../components/JokeItems";
 import '../types/extension';
-import {darksalmonColor, indigoColor, purpleColor} from "../assets/Theme";
 
 export default function Catalogue() {
     const allJokes = [...customJokeStub, ...sampleJokeStub];
-return (
-    <>
-        <SafeAreaView style={styles.container}>
-            <JokeListItem jokes={allJokes}/>
-        </SafeAreaView>
-    </>
-)
-};
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: purpleColor,
-    },
-    centered: {
-        color:darksalmonColor,
-        fontSize:24,
-        textAlign: "center",
-        paddingBottom:20,
-    },
-    title: {
-        backgroundColor: indigoColor
-    },
-    topSafeArea: {
-        flex: 0,
-        backgroundColor: indigoColor
-    }
-});
\ No newline at end of file
+    return (
+        <JokeItems jokes={allJokes}/>
+    )
+};
\ No newline at end of file
diff --git a/src/screens/Favorites.tsx b/src/screens/Favorites.tsx
index 8b65ba0..66e2488 100644
--- a/src/screens/Favorites.tsx
+++ b/src/screens/Favorites.tsx
@@ -1,41 +1,11 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
 import { customJokeStub } from '../data/stub/CustomJokeStub';
 import { sampleJokeStub } from '../data/stub/SampleJokeStub';
-import { SafeAreaView } from 'react-native'
-import JokeListItem from "../components/JokeListItem";
+import JokeItems from "../components/JokeItems";
 import '../types/extension';
-import {darksalmonColor, indigoColor, purpleColor} from "../assets/Theme";
 
 export default function Catalogue() {
     const allJokes = [...customJokeStub, ...sampleJokeStub];
     return (
-        <>
-            <SafeAreaView style={styles.topSafeArea}/>
-            <SafeAreaView style={styles.container}>
-                <StatusBar style="light" />
-                <JokeListItem jokes={allJokes}/>
-            </SafeAreaView>
-        </>
+        <JokeItems jokes={allJokes}/>
     )
-};
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: purpleColor,
-    },
-    centered: {
-        color:darksalmonColor,
-        fontSize:24,
-        textAlign: "center",
-        paddingBottom:20,
-    },
-    title: {
-        backgroundColor: indigoColor
-    },
-    topSafeArea: {
-        flex: 0,
-        backgroundColor: indigoColor
-    }
-});
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/screens/HomeScreen.tsx b/src/screens/HomeScreen.tsx
index 9073554..efb1cab 100644
--- a/src/screens/HomeScreen.tsx
+++ b/src/screens/HomeScreen.tsx
@@ -1,15 +1,10 @@
-import { StatusBar } from 'expo-status-bar';
-import {FlatList, Image, StyleSheet, Text, View} from 'react-native';
+import {Image, StyleSheet, Text, View} from 'react-native';
 import { customJokeStub } from '../data/stub/CustomJokeStub';
 import { sampleJokeStub } from '../data/stub/SampleJokeStub';
-import { SafeAreaView } from 'react-native'
-import JokeListItem from "../components/JokeListItem";
 import '../types/extension';
-import {darksalmonColor, indigoColor, purpleColor, whiteColor} from "../assets/Theme";
-import JokeListHomeSquare from "../components/JokeListHomeSquare";
-import CategList from "../components/CategList";
-import {CustomJoke} from "../model/CustomJoke";
-import {SampleJoke} from "../model/SampleJoke";
+import {darksalmonColor, purpleColor, whiteColor} from "../assets/Theme";
+import JokesHomeSquare from "../components/JokesHomeSquare";
+import Categs from "../components/Categs";
 
 export default function Catalogue() {
     const allJokes = [...customJokeStub, ...sampleJokeStub];
@@ -22,7 +17,7 @@ export default function Catalogue() {
                 </View>
                 <View style={styles.Jokes}>
                     <Text style={styles.textLastJokes}>Dernières blagues</Text>
-                    <JokeListHomeSquare jokes={allJokes} />
+                    <JokesHomeSquare jokes={allJokes} />
                 </View>
                 <View style={styles.bestCateg}>
                     <View style={styles.horizBestCateg}>
@@ -30,7 +25,7 @@ export default function Catalogue() {
                         <Image source={require("../assets/fire_icon.png")}/>
                     </View>
                     <View style={styles.horizChip}>
-                        <CategList jokes={allJokes}/>
+                        <Categs jokes={allJokes}/>
                     </View>
                 </View>
             </View>
diff --git a/src/screens/Settings.tsx b/src/screens/Settings.tsx
index 8b65ba0..66e2488 100644
--- a/src/screens/Settings.tsx
+++ b/src/screens/Settings.tsx
@@ -1,41 +1,11 @@
-import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, Text, View } from 'react-native';
 import { customJokeStub } from '../data/stub/CustomJokeStub';
 import { sampleJokeStub } from '../data/stub/SampleJokeStub';
-import { SafeAreaView } from 'react-native'
-import JokeListItem from "../components/JokeListItem";
+import JokeItems from "../components/JokeItems";
 import '../types/extension';
-import {darksalmonColor, indigoColor, purpleColor} from "../assets/Theme";
 
 export default function Catalogue() {
     const allJokes = [...customJokeStub, ...sampleJokeStub];
     return (
-        <>
-            <SafeAreaView style={styles.topSafeArea}/>
-            <SafeAreaView style={styles.container}>
-                <StatusBar style="light" />
-                <JokeListItem jokes={allJokes}/>
-            </SafeAreaView>
-        </>
+        <JokeItems jokes={allJokes}/>
     )
-};
-
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        backgroundColor: purpleColor,
-    },
-    centered: {
-        color:darksalmonColor,
-        fontSize:24,
-        textAlign: "center",
-        paddingBottom:20,
-    },
-    title: {
-        backgroundColor: indigoColor
-    },
-    topSafeArea: {
-        flex: 0,
-        backgroundColor: indigoColor
-    }
-});
\ No newline at end of file
+};
\ No newline at end of file