diff --git a/src/components/card.astro b/src/components/card.astro
index c60acfa6..fc6aa852 100644
--- a/src/components/card.astro
+++ b/src/components/card.astro
@@ -1,10 +1,21 @@
 ---
-import { Tick } from "@components/ui/icons";
 import SquareRoundedCheck from "@components/ui/icons/square-rounded-check.astro";
 
-import Link from "@components/ui/link.astro";
+export type CardInfo = {
+  name: string;
+  popular: boolean;
+  features: string[];
+  button: {
+    text: string;
+    link: string;
+  };
+};
 
+type Props = {
+  card: CardInfo;
+}
 const { card } = Astro.props;
+
 ---
 
 <div>
diff --git a/src/components/container.astro b/src/components/container.astro
index b8ce53ac..c32890a6 100644
--- a/src/components/container.astro
+++ b/src/components/container.astro
@@ -1,4 +1,7 @@
 ---
+type Props = {
+  class?: string;
+}
 const { class: className } = Astro.props;
 ---
 
diff --git a/src/components/features.astro b/src/components/features.astro
index bd37d6cb..45469099 100644
--- a/src/components/features.astro
+++ b/src/components/features.astro
@@ -42,7 +42,6 @@ const features = [
   },
 ];
 ---
-
 <div class="mt-16 md:mt-0">
   <h2 class="text-3xl sm:text-4xl lg:text-5xl font-bold lg:tracking-tight">
     Missions de l'institut
diff --git a/src/components/item.astro b/src/components/item.astro
index c68a871e..54d56bde 100644
--- a/src/components/item.astro
+++ b/src/components/item.astro
@@ -1,21 +1,29 @@
 ---
 import { Icon } from "astro-icon";
-const { color = "white", icon = "circle-filled" } = Astro.props;
-
-let textColor;
-let backgroundColor;
 
-if (color == "white") {
-    textColor = "text-white";
-    backgroundColor = "bg-black";
-} else {
-    textColor = `text-${color}-600`;
-    backgroundColor = `bg-${color}-100`;
+const supportedStyles = {
+    white: {
+        textColor: "text-white",
+        backgroundColor: "bg-black",
+    },
+    sky: {
+        textColor: "text-sky-600",
+        backgroundColor: "bg-sky-100",
+    },
+    purple: {
+        textColor: "text-purple-600",
+        backgroundColor: "bg-purple-100",
+    },
 }
+type SupportedStyle = keyof typeof supportedStyles;
+
+type Props = {
+    color?: SupportedStyle;
+    icon: string;
+};
+const { color = "white", icon = "circle-filled" } = Astro.props;
 
-// Tailwind tree shaker
-("bg-sky-100 bg-purple-100 bg-red-100 bg-black");
-("text-sky-600 text-purple-600 text-red-600 text-black");
+const {textColor, backgroundColor } = supportedStyles[color]
 ---
 
 <span class="relative">
diff --git a/src/components/itn-list-item.astro b/src/components/itn-list-item.astro
index bd5bc62b..58e67a9b 100644
--- a/src/components/itn-list-item.astro
+++ b/src/components/itn-list-item.astro
@@ -1,6 +1,9 @@
 ---
-import Topic from "/src/components/itn-topic.astro";
+import Topic, { type ItnTopicType } from "./itn-topic.astro";
 
+type Props = {
+  name: ItnTopicType;
+};
 const { name } = Astro.props;
 ---
 
diff --git a/src/components/itn-topic.astro b/src/components/itn-topic.astro
index 8536dab8..b6dc45de 100644
--- a/src/components/itn-topic.astro
+++ b/src/components/itn-topic.astro
@@ -4,27 +4,28 @@ import { Icon } from "astro-icon";
 const icons = {
   "Ingénierie Numérique": {
     name: "abacus",
-    iconColor: "sky-600",
-    backgroundColor: "sky-100",
+    iconColor: "text-sky-600",
+    backgroundColor: "bg-sky-100",
   },
   "Industries Culturelles et Créatives": {
     name: "tabler:palette",
-    iconColor: "purple-600",
-    backgroundColor: "purple-100",
+    iconColor: "text-purple-600",
+    backgroundColor: "bg-purple-100",
   },
   "Santé Numérique": {
     name: "tabler:vaccine",
-    iconColor: "red-600",
-    backgroundColor: "red-100",
+    iconColor: "text-red-600",
+    backgroundColor: "bg-red-100",
   },
 };
+export type ItnTopicType = keyof typeof icons;
 
+type Props = {
+  name: ItnTopicType;
+};
 const { name } = Astro.props;
-const icon = icons[name];
 
-`bg-sky-100 text-sky-600 
-bg-purple-100 text-purple-600
-bg-red-100 bg-red-600`;
+const icon = icons[name];
 ---
 
 <span
@@ -34,10 +35,10 @@ bg-red-100 bg-red-600`;
   title={name}>
   <span style="position: relative; top:0.0625em;">
     <span
-      class={`bg-${icon.backgroundColor} top-1 mt-0 w-5 h-5 rounded inline-flex items-center justify-center`}>
+      class={`${icon.backgroundColor} top-1 mt-0 w-5 h-5 rounded inline-flex items-center justify-center`}>
       <Icon
         name={icon.name}
-        class={`text-${icon.iconColor} inline-block w-4 h-4`}
+        class={`${icon.iconColor} inline-block w-4 h-4`}
       />
     </span>
   </span>
diff --git a/src/components/list-item.astro b/src/components/list-item.astro
index 7e428ba1..75fda1f1 100644
--- a/src/components/list-item.astro
+++ b/src/components/list-item.astro
@@ -1,24 +1,33 @@
 ---
 import { Icon } from "astro-icon";
-const { color = "white", icon = "circle-filled" } = Astro.props;
 
-let textColor;
-let backgroundColor;
+const supportedStyles = {
+  white: {
+    textColor: "text-white",
+    backgroundColor: "bg-bkack",
+  },
+  black: {
+    textColor: "text-black",
+    backgroundColor: "bg-white",
+  },
+  sky: {
+    textColor: "text-sky-600",
+    backgroundColor: "bg-sky-100",
+  },
+  purple: {
+    textColor: "text-purple-600",
+    backgroundColor: "bg-purple-100",
+  },
+};
+type SupportedStyle = keyof typeof supportedStyles;
 
-if (color == "white") {
-  textColor = "text-white";
-  backgroundColor = "bg-black";
-} else if (color == "black") {
-  textColor = "text-black";
-  backgroundColor = "bg-white";
-} else {
-  textColor = `text-${color}-600`;
-  backgroundColor = `bg-${color}-100`;
-}
+type Props = {
+  color?: SupportedStyle;
+  icon?: string;
+};
+const { color = "white", icon = "circle-filled" } = Astro.props;
 
-// Tailwind tree shaker
-("bg-sky-100 bg-purple-100 bg-red-100 bg-black bg-white");
-("text-sky-600 text-purple-600 text-red-600 text-white text-black");
+const { textColor, backgroundColor} = supportedStyles[color];
 ---
 
 <li class="relative">
diff --git a/src/components/mareva-list-item.astro b/src/components/mareva-list-item.astro
index 7c34b356..7bca6ced 100644
--- a/src/components/mareva-list-item.astro
+++ b/src/components/mareva-list-item.astro
@@ -1,5 +1,9 @@
 ---
-import Topic from "/src/components/mareva-topic-alt.astro";
+import Topic, { type MarevaTopicType } from "./mareva-topic-alt.astro";
+
+type Props = {
+  name: MarevaTopicType
+};
 const { name } = Astro.props;
 ---
 
diff --git a/src/components/mareva-topic-alt.astro b/src/components/mareva-topic-alt.astro
index 5715be13..c23d9779 100644
--- a/src/components/mareva-topic-alt.astro
+++ b/src/components/mareva-topic-alt.astro
@@ -23,17 +23,14 @@ const icons = {
     background: "purple-200",
   },
 };
+export type MarevaTopicType = keyof typeof icons;
 
+type Props = {
+  name: MarevaTopicType
+};
 const { name } = Astro.props;
-const icon = icons[name];
 
-`bg-slate-800 text-slate-200 
-bg-orange-200 text-orange-500 
-bg-slate-200 text-slate-800 
-text-green-200
-bg-purple-200 text-purple-500
-bg-rose-200 text-rose-500
-bg-blue-200 text-blue-500`;
+const icon = icons[name];
 ---
 
 <span
diff --git a/src/components/mareva-topic.astro b/src/components/mareva-topic.astro
index a6bd39e4..41651cc8 100644
--- a/src/components/mareva-topic.astro
+++ b/src/components/mareva-topic.astro
@@ -8,6 +8,9 @@ const icons = {
   Apprentissage: "brain",
 };
 
+type Props = {
+  name: keyof typeof icons;
+};
 const { name } = Astro.props;
 ---
 
diff --git a/src/components/movie-project.astro b/src/components/movie-project.astro
index 72da6dde..cc45d49d 100644
--- a/src/components/movie-project.astro
+++ b/src/components/movie-project.astro
@@ -1,12 +1,7 @@
 ---
 import { Image } from "@astrojs/image/components";
-import { Picture } from "@astrojs/image/components";
-import Link from "@components/ui/card-link.astro";
 import { Icon } from "astro-icon";
 
-let { title, author, description, image, url, tags } = Astro.props;
-
-tags = tags.split(",").map((tag) => tag.trim());
 
 const icons = {
   Photogrammétrie: "stereo-glasses",
@@ -20,10 +15,18 @@ const icons = {
   Innovation: "bulb",
 };
 
-// import crossingTheLandscape from "assets/crossing-the-landscape.png";
+type Props = {
+  title: string;
+  author: string;
+  description: string;
+  image: ImageMetadata;
+  url: string;
+  tags: string | string[];
+};
+const { title, author, description, image, url, tags: tagListOrString } = Astro.props;
 
-// const url =
-//     "https://projet-ingenierie.minesparis.psl.eu/portfolio/capture-volumetrique-et-danse-collaboration-avec-lartiste-celeste-rogosin/";
+const tagList = Array.isArray(tagListOrString) ? tagListOrString : tagListOrString.split(",");
+const tags = tagList.map((tag) => tag.trim());
 ---
 
 <div
@@ -32,8 +35,8 @@ const icons = {
     src={image}
     class="hidden md:inline-block rounded-l-md m-0"
     alt="Crossing the Landscape"
-    width="196"
-    height="196"
+    width={196}
+    height={196}
     loading="eager"
     format="avif"
   />
diff --git a/src/components/named-tag.astro b/src/components/named-tag.astro
index 81ff78d6..66fe6c41 100644
--- a/src/components/named-tag.astro
+++ b/src/components/named-tag.astro
@@ -1,9 +1,7 @@
 ---
 import { Icon } from "astro-icon";
 
-const { type } = Astro.props;
-
-const style = {
+const AvailableStyles = {
   "Ingénierie Numérique": {
     iconName: "abacus",
     iconColor: "text-sky-600",
@@ -28,8 +26,15 @@ const style = {
     backgroundColor: "bg-slate-100",
     textColor: "text-slate-900",
   },
-}[type]
+}
+type TagType = keyof typeof AvailableStyles;
+
+type Props = {
+  type: TagType;
+};
+const { type } = Astro.props;
 
+const style = AvailableStyles[type];
 ---
 
 <span class={`py-1 px-1 rounded relative ${style.backgroundColor} ${style.iconColor}`}>
diff --git a/src/components/navbar/dropdown.astro b/src/components/navbar/dropdown.astro
index b743a38d..dc4a8d3b 100644
--- a/src/components/navbar/dropdown.astro
+++ b/src/components/navbar/dropdown.astro
@@ -1,10 +1,10 @@
 ---
-import { Dropdown, DropdownItems } from "astro-navbar";
+import { Dropdown as AstroDropdown, DropdownItems } from "astro-navbar";
 const { title, lastItem, children } = Astro.props;
 ---
 
 <li class="relative">
-  <Dropdown class="group">
+  <AstroDropdown class="group">
     <button
       class="flex items-center gap-1 w-full lg:w-auto lg:px-3 py-2 text-gray-600 hover:text-gray-900">
       <span>{title}</span>
@@ -43,5 +43,5 @@ const { title, lastItem, children } = Astro.props;
         </div>
       </div>
     </DropdownItems>
-  </Dropdown>
+  </AstroDropdown>
 </li>
diff --git a/src/components/navbar/navbar.astro b/src/components/navbar/navbar.astro
index 9da13409..016e1f17 100644
--- a/src/components/navbar/navbar.astro
+++ b/src/components/navbar/navbar.astro
@@ -1,13 +1,17 @@
 ---
 import Container from "@components/container.astro";
-import Link from "@components/ui/link.astro";
 import ITNLogo from "@components/itn-logo.astro";
 import Dropdown from "./dropdown.astro";
 import { Astronav, MenuItems, MenuIcon } from "astro-navbar";
-import { Icon } from "astro-icon";
 import Social from "@components/social.astro";
 
-const menuitems = [
+type MenuItem = {
+  title: string;
+  path: string;
+  children?: MenuItem[];
+};
+
+const menuitems: MenuItem[] = [
   // {
   //   title: "Features",
   //   path: "#",
diff --git a/src/components/new-movie-project.astro b/src/components/new-movie-project.astro
index a6da3a57..76b4b5aa 100644
--- a/src/components/new-movie-project.astro
+++ b/src/components/new-movie-project.astro
@@ -1,33 +1,8 @@
 ---
 import { Image } from "@astrojs/image/components";
-import { Picture } from "@astrojs/image/components";
-import Link from "@components/ui/card-link.astro";
 import { Icon } from "astro-icon";
 
-type TagType =
-  | "Photogrammétrie"
-  | "Modélisation 3D"
-  | "Interactions"
-  | "Accessibilité"
-  | "Réalité Augmentée"
-  | "Réalité Virtuelle"
-  | "Collaboration"
-  | "Programmation"
-  | "Innovation";
-
-interface Props {
-  title: string;
-  author: string;
-  description: string;
-  image: string;
-  url?: string;
-  tags?: TagType[];
-}
-
-let { title, author, description, image, url, tags } = Astro.props;
-
-tags = tags || [];
-
+  // les icônes supportées
 const icons = {
   Photogrammétrie: "stereo-glasses",
   "Modélisation 3D": "frustum",
@@ -39,6 +14,17 @@ const icons = {
   Programmation: "code",
   Innovation: "bulb",
 };
+type TagType = keyof typeof icons;
+
+type Props = {
+  title: string;
+  author: string;
+  description: string;
+  image: string;
+  url?: string;
+  tags?: TagType[];
+}
+const { title, author, description, image, url, tags=[] } = Astro.props;
 
 // import crossingTheLandscape from "assets/crossing-the-landscape.png";
 
@@ -52,8 +38,8 @@ const icons = {
     src={image}
     class="hidden md:inline-block rounded-l-md m-0"
     alt="Crossing the Landscape"
-    width="196"
-    height="196"
+    width={196}
+    height={196}
     loading="eager"
     format="avif"
   />
diff --git a/src/components/open-source-card.astro b/src/components/open-source-card.astro
index fa537295..4d67e769 100644
--- a/src/components/open-source-card.astro
+++ b/src/components/open-source-card.astro
@@ -2,7 +2,20 @@
 import { Icon } from "astro-icon";
 import { Picture } from "@astrojs/image/components";
 
-const { name, by, image, description, homepage, github, license } = Astro.props;
+export type OpenSourceProject = {
+  name: string;
+  by: string;
+  image: ImageMetadata;
+  description: string;
+  homepage: string;
+  github: string;
+  license: string;
+};
+
+type Props = {
+  attrs: OpenSourceProject;
+};
+const { name, by, image, description, homepage, github, license } = Astro.props.attrs;
 ---
 
 <div
diff --git a/src/components/portrait.astro b/src/components/portrait.astro
index 56374f31..39817a03 100644
--- a/src/components/portrait.astro
+++ b/src/components/portrait.astro
@@ -2,8 +2,23 @@
 import Tag from "@components/named-tag.astro"
 import { Icon } from "astro-icon";
 
-const { attrs } = Astro.props;
-const { name, role, email, url, linkedin, github, skills } = attrs;
+export type TeamMember = {
+  name: string;
+  role: string;
+  email: string;
+  linkedin?: string;
+  github?: string;
+  url?: string;
+  skills: {
+    [key: string]: string[];
+  };
+};
+
+type Props = {
+    attrs: TeamMember;
+};
+const { name, role, email, url, linkedin, github, skills } = Astro.props.attrs;
+
 const emailHref = `mailto:${email}?cc=itn@minesparis.psl.eu&subject=[ITN]`;
 const image = `${import.meta.env.BASE_URL}portraits/${name}.webp`;
 const linkedinHref = linkedin && `https://www.linkedin.com/in/${linkedin}/`;
diff --git a/src/components/pricing.astro b/src/components/pricing.astro
deleted file mode 100644
index ccdf8e8a..00000000
--- a/src/components/pricing.astro
+++ /dev/null
@@ -1,45 +0,0 @@
----
-import { Tick } from "@components/ui/icons";
-import Link from "@components/ui/link.astro";
-
-const { plan } = Astro.props;
----
-
-<div>
-  <div
-    class="flex flex-col w-full order-first lg:order-none border-2 border-[#D8DEE9] border-opacity-50 py-5 px-6 rounded-md">
-    <div class="text-center">
-      <h4 class="text-lg font-medium text-gray-400">{plan.name}</h4><p
-        class="mt-3 text-4xl font-bold text-black md:text-4xl">
-        {
-          plan.price && typeof plan.price === "object"
-            ? plan.price.monthly
-            : plan.price
-        }
-      </p>
-      <!-- {
-        plan.price.original && (
-          <p class="mt-1 text-xl font-medium text-gray-400 line-through md:text-2xl">
-            {plan.price.original}
-          </p>
-        )
-      } -->
-    </div><ul class="grid mt-8 text-left gap-y-4">
-      {
-        plan.features.map((item) => (
-          <li class="flex items-start gap-3 text-gray-800">
-            <Tick class="w-6 h-6" />
-            <span>{item}</span>
-          </li>
-        ))
-      }
-    </ul><div class="flex mt-8">
-      <Link
-        href={plan.button.link || "#"}
-        block
-        style={plan.popular ? "primary" : "outline"}>
-        {plan.button.text || "Get Started"}
-      </Link>
-    </div>
-  </div>
-</div>
diff --git a/src/components/sectionhead.astro b/src/components/sectionhead.astro
index fb134ef7..64048c8d 100644
--- a/src/components/sectionhead.astro
+++ b/src/components/sectionhead.astro
@@ -1,4 +1,7 @@
 ---
+type Props = {
+    align?: "center" | "left";
+};
 const { align = "center" } = Astro.props;
 ---
 
diff --git a/src/components/social.astro b/src/components/social.astro
index a96f1425..056299c5 100644
--- a/src/components/social.astro
+++ b/src/components/social.astro
@@ -1,6 +1,9 @@
 ---
 import { Icon } from "astro-icon";
 
+type Props = {
+    extra?: string;
+};
 const { extra } = Astro.props;
 ---
 
diff --git a/src/components/tag.astro b/src/components/tag.astro
index 18f69175..3fbdc383 100644
--- a/src/components/tag.astro
+++ b/src/components/tag.astro
@@ -1,10 +1,41 @@
 ---
 import { Icon } from "astro-icon";
 
+type Props = {
+    color?: "slate" | "sky" | "purple" | "red";
+    icon?: string;
+    tag: string;
+};
 const { color = "slate", icon = "circle-filled", tag } = Astro.props;
-const background = `bg-${color}-50`;
-const spanClass = `relative top-[1px] h-6 w-6 rounded-full inline-flex items-center justify-center bg-${color}-50`;
-const iconClass = `inline-block w-4 h-4 text-${color}-600`;
+
+// j'ai rajouté cette "map" pour que Tailwind puisse "tree shaker" les classes inutilisées
+const classesByColor = {
+    slate: {
+        background: "bg-slate-50",
+        span: "bg-slate-50",
+        icon: "text-slate-600",
+    },
+    sky: {
+        background: "bg-sky-50",
+        span: "bg-sky-50",
+        icon: "text-sky-600",
+    },
+    purple: {
+        background: "bg-purple-50",
+        span: "bg-purple-50",
+        icon: "text-purple-600",
+    },
+    red: {
+        background: "bg-red-50",
+        span: "bg-red-50",
+        icon: "text-red-600",
+    },
+}
+
+const colors = classesByColor[color];
+const background = colors.background;
+const spanClass = `relative top-[1px] h-6 w-6 rounded-full inline-flex items-center justify-center ${colors.span}`;
+const iconClass = `inline-block w-4 h-4 ${colors.icon}`;
 
 // Tailwind tree shaker
 ("bg-sky-200 bg-purple-200 bg-red-200");
diff --git a/src/components/ui/button.astro b/src/components/ui/button.astro
index 53f93394..2863622c 100644
--- a/src/components/ui/button.astro
+++ b/src/components/ui/button.astro
@@ -1,12 +1,21 @@
 ---
-interface Props {
-  size?: "md" | "lg";
+const sizes = {
+  md: "px-5 py-2.5",
+  lg: "px-6 py-3",
+};
+const styles = {
+  outline: "border-2 border-black hover:bg-black text-black hover:text-white",
+  primary:
+    "bg-black text-white hover:bg-slate-900  border-2 border-transparent",
+};
+
+type Props = object & {
+  size?: keyof typeof sizes;
   block?: boolean;
-  style?: "outline" | "primary" | "inverted";
+  style?: keyof typeof styles;
   class?: string;
   [x: string]: any;
 }
-
 const {
   size = "md",
   style = "primary",
@@ -15,16 +24,6 @@ const {
   ...rest
 } = Astro.props;
 
-const sizes = {
-  md: "px-5 py-2.5",
-  lg: "px-6 py-3",
-};
-
-const styles = {
-  outline: "border-2 border-black hover:bg-black text-black hover:text-white",
-  primary:
-    "bg-black text-white hover:bg-slate-900  border-2 border-transparent",
-};
 ---
 
 <button
diff --git a/src/components/ui/card-link.astro b/src/components/ui/card-link.astro
index 81702d6c..8c72cd88 100644
--- a/src/components/ui/card-link.astro
+++ b/src/components/ui/card-link.astro
@@ -1,13 +1,24 @@
 ---
+const sizes = {
+  lg: "px-5 py-2.5",
+  md: "px-4 py-2",
+  sm: "px-3 py-1.5",
+};
+const styles = {
+  outline: "bg-gray-100 hover:bg-gray-200 text-gray-700 hover:text-gray-900",
+  primary: "bg-black text-white hover:bg-gray-800  border-2 border-transparent",
+  inverted: "bg-white text-black   border-2 border-transparent",
+  muted: "bg-gray-100 hover:bg-gray-200   border-2 border-transparent",
+};
+
 interface Props {
   href: string;
-  size?: "sm" | "md" | "lg";
+  size?: keyof typeof sizes;
   block?: boolean;
-  style?: "outline" | "primary" | "inverted" | "muted";
+  style?: keyof typeof styles;
   class?: string;
   [x: string]: any;
 }
-
 const {
   href,
   block,
@@ -16,19 +27,6 @@ const {
   class: className,
   ...rest
 } = Astro.props;
-
-const sizes = {
-  lg: "px-5 py-2.5",
-  md: "px-4 py-2",
-  sm: "px-3 py-1.5",
-};
-
-const styles = {
-  outline: "bg-gray-100 hover:bg-gray-200 text-gray-700 hover:text-gray-900",
-  primary: "bg-black text-white hover:bg-gray-800  border-2 border-transparent",
-  inverted: "bg-white text-black   border-2 border-transparent",
-  muted: "bg-gray-100 hover:bg-gray-200   border-2 border-transparent",
-};
 ---
 
 <a
diff --git a/src/components/ui/icons/code.astro b/src/components/ui/icons/code.astro
index 48b1df3a..a7abb72c 100644
--- a/src/components/ui/icons/code.astro
+++ b/src/components/ui/icons/code.astro
@@ -1,5 +1,4 @@
 ---
-const { class: className } = Astro.props;
 ---
 
 <svg
diff --git a/src/components/ui/icons/square-rounded-check.astro b/src/components/ui/icons/square-rounded-check.astro
index 0d6ca8cb..abc3913f 100644
--- a/src/components/ui/icons/square-rounded-check.astro
+++ b/src/components/ui/icons/square-rounded-check.astro
@@ -1,4 +1,7 @@
 ---
+type Props = {
+  class?: string;
+}
 const { class: className } = Astro.props;
 ---
 
diff --git a/src/components/ui/icons/tick.astro b/src/components/ui/icons/tick.astro
index bf83b8cd..ccb8f21f 100644
--- a/src/components/ui/icons/tick.astro
+++ b/src/components/ui/icons/tick.astro
@@ -1,4 +1,7 @@
 ---
+type Props = {
+  class?: string;
+}
 const { class: className } = Astro.props;
 ---
 
diff --git a/src/components/ui/link.astro b/src/components/ui/link.astro
index 54976fc5..11f870af 100644
--- a/src/components/ui/link.astro
+++ b/src/components/ui/link.astro
@@ -1,13 +1,23 @@
 ---
-interface Props {
+const sizes = {
+  lg: "px-5 py-2.5",
+  md: "px-4 py-2",
+};
+const styles = {
+  outline: "bg-white border-2 border-black hover:bg-gray-100 text-black ",
+  primary: "bg-black text-white hover:bg-gray-800  border-2 border-transparent",
+  inverted: "bg-white text-black   border-2 border-transparent",
+  muted: "bg-gray-100 hover:bg-gray-200   border-2 border-transparent",
+};
+
+type Props = object & {
   href: string;
-  size?: "md" | "lg";
+  size?: keyof typeof sizes;
   block?: boolean;
-  style?: "outline" | "primary" | "inverted" | "muted";
+  style?: keyof typeof styles;
   class?: string;
   [x: string]: any;
 }
-
 const {
   href,
   block,
@@ -16,18 +26,6 @@ const {
   class: className,
   ...rest
 } = Astro.props;
-
-const sizes = {
-  lg: "px-5 py-2.5",
-  md: "px-4 py-2",
-};
-
-const styles = {
-  outline: "bg-white border-2 border-black hover:bg-gray-100 text-black ",
-  primary: "bg-black text-white hover:bg-gray-800  border-2 border-transparent",
-  inverted: "bg-white text-black   border-2 border-transparent",
-  muted: "bg-gray-100 hover:bg-gray-200   border-2 border-transparent",
-};
 ---
 
 <a
diff --git a/src/components/video.astro b/src/components/video.astro
index adb60dc5..b6aca713 100644
--- a/src/components/video.astro
+++ b/src/components/video.astro
@@ -1,5 +1,13 @@
 ---
+import { JSX } from 'astro/jsx-runtime';
+
+type Props = {
+    id: string;
+    width?: JSX.IntrinsicElements['iframe']['width']
+    height?: JSX.IntrinsicElements['iframe']['height'];
+};
 const { id, width = "320", height = "180" } = Astro.props;
+
 const src = `https://www.youtube.com/embed/${id}`;
 ---
 
diff --git a/src/components/video2.astro b/src/components/video2.astro
index f7ca78e8..26b28d63 100644
--- a/src/components/video2.astro
+++ b/src/components/video2.astro
@@ -1,10 +1,17 @@
 ---
 import { Icon } from "astro-icon";
-import { Image } from "@astrojs/image/components";
+import { Image} from "@astrojs/image/components";
 
+// image par défaut
 import esquive1 from "assets/L'Art de l'Esquive 1.png";
 
+type Props = {
+    id: string;
+    title: string;
+    image?: ImageMetadata;
+};
 const { id, title, image = esquive1 } = Astro.props;
+
 const src = `https://www.youtube.com/embed/${id}`;
 ---
 
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index d5e9d593..66a027eb 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -6,8 +6,9 @@ import "@fontsource-variable/inter/index.css";
 
 export interface Props {
   title: string;
-  description: string;
+  description?: string;
 }
+const { title, description } = Astro.props;
 
 const canonicalURL = new URL(Astro.url.pathname, Astro.site).toString();
 
@@ -16,7 +17,6 @@ const resolvedImageWithDomain = new URL(
   Astro.site
 ).toString();
 
-const { title, description } = Astro.props;
 
 const makeTitle = title
   ? title + " | " + "ITN"
diff --git a/src/layouts/NewBlogLayout.astro b/src/layouts/NewBlogLayout.astro
index 8717f369..b71da8fc 100644
--- a/src/layouts/NewBlogLayout.astro
+++ b/src/layouts/NewBlogLayout.astro
@@ -1,7 +1,6 @@
 ---
 import Container from "@components/container.astro";
 import { getFormattedDate } from "@utils/all";
-import { log } from "astro/dist/core/logger/core";
 import Layout from "./NewLayout.astro";
 
 const { frontmatter } = Astro.props;
diff --git a/src/layouts/NewLayout.astro b/src/layouts/NewLayout.astro
index d0f7e3b6..c6d392bc 100644
--- a/src/layouts/NewLayout.astro
+++ b/src/layouts/NewLayout.astro
@@ -2,7 +2,6 @@
 import { SEO } from "astro-seo";
 
 import Container from "@components/container.astro";
-import SectionHead from "@components/sectionhead.astro";
 import Footer from "@components/footer.astro";
 import Navbar from "@components/navbar/navbar.astro";
 import "@fontsource-variable/inter/index.css";
@@ -11,18 +10,18 @@ import Sectionhead from "@components/sectionhead.astro";
 interface Props {
   title?: string;
   description?: string;
+  heading?: string;
   no_header?: boolean;
   image?: string;
   type?: "website" | "article";
 }
+let { title, no_header = false, description, image, type } = Astro.props;
 
 let url = Astro.url.href;
 if (url.endsWith("/")) {
   url = url.slice(0, -1);
 }
 
-let { title, no_header = false, description, image, type } = Astro.props;
-
 const base = import.meta.env.BASE_URL;
 const path = Astro.url.pathname;
 
diff --git a/src/pages/actualites/[slug].astro b/src/pages/actualites/[slug].astro
index 8051bdaa..86eb1cd9 100644
--- a/src/pages/actualites/[slug].astro
+++ b/src/pages/actualites/[slug].astro
@@ -1,7 +1,6 @@
 ---
 import { getCollection } from "astro:content";
 import Layout from "@layouts/NewLayout.astro";
-import Container from "@components/container.astro";
 
 // Generate a new path for every collection entry
 export async function getStaticPaths() {
diff --git a/src/pages/contact.astro b/src/pages/contact.astro
index 31224329..33a72769 100644
--- a/src/pages/contact.astro
+++ b/src/pages/contact.astro
@@ -1,8 +1,6 @@
 ---
 import { Icon } from "astro-icon";
 import Layout from "@layouts/NewLayout.astro";
-import Container from "@components/container.astro";
-import Sectionhead from "@components/sectionhead.astro";
 import Link from "@components/ui/link.astro";
 import Contactform from "@components/contactform.astro";
 ---
diff --git a/src/pages/equipe.astro b/src/pages/equipe.astro
index 7b90345f..527d5d97 100644
--- a/src/pages/equipe.astro
+++ b/src/pages/equipe.astro
@@ -1,8 +1,9 @@
 ---
 import Layout from "@layouts/NewLayout.astro";
 import Portrait from "@components/portrait.astro";
+import { type TeamMember } from "@components/portrait.astro";
 
-const data = [
+const data: TeamMember[] = [
   {
     "name": "Brigitte d'Andréa-Novel",
     "role": "Professeure, Directrice de l'ITN",
diff --git a/src/pages/organisation.astro b/src/pages/organisation.astro
index 7564a8d3..82949218 100644
--- a/src/pages/organisation.astro
+++ b/src/pages/organisation.astro
@@ -1,8 +1,8 @@
 ---
 import Layout from "@layouts/NewLayout.astro";
-import Card from "@components/card.astro";
+import Card, { type CardInfo } from "@components/card.astro";
 
-const cards = [
+const cards: CardInfo[] = [
   {
     name: "Equipe de Direction",
     popular: false,