diff --git a/src/components/atoms/button.astro b/src/components/atoms/button.astro
new file mode 100644
index 0000000..c47f2bc
--- /dev/null
+++ b/src/components/atoms/button.astro
@@ -0,0 +1,15 @@
+---
+export interface Props extends astroHTML.JSX.ButtonHTMLAttributes {}
+
+const props = Astro.props;
+---
+
+<button
+  type="button"
+  {...props}
+  class:list={[
+    'inline-flex items-center px-4 h-10 text-base font-medium rounded-md shadow-sm text-white bg-primary-600 hover:bg-primary-700 active:translate-y-px focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
+    props.class,
+  ]}
+  ><slot />
+</button>
diff --git a/src/components/atoms/button/button.stories.tsx b/src/components/atoms/button/button.stories.tsx
deleted file mode 100644
index dc11f99..0000000
--- a/src/components/atoms/button/button.stories.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ComponentMeta, ComponentStory } from '@storybook/react';
-
-import * as C from './button';
-
-export default {
-  title: 'Button',
-  component: C.Button,
-  argTypes: {
-    onClick: { action: 'onClick' },
-  },
-} as ComponentMeta<typeof C.Button>;
-
-export const Button: ComponentStory<typeof C.Button> = (args) => <C.Button {...args} />;
-
-Button.args = {
-  children: 'Button text',
-};
diff --git a/src/components/atoms/button/button.tsx b/src/components/atoms/button/button.tsx
deleted file mode 100644
index bfe6e6c..0000000
--- a/src/components/atoms/button/button.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import clsx from 'clsx';
-import type { ComponentPropsWithoutRef } from 'react';
-
-interface ButtonProps extends ComponentPropsWithoutRef<'button'> {}
-
-export const Button = ({ className, ...props }: ButtonProps) => (
-  <button
-    type="button"
-    className={clsx(
-      'inline-flex items-center px-4 h-10 text-base font-medium rounded-md shadow-sm text-white bg-primary-600 hover:bg-primary-700 active:translate-y-px focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
-      className
-    )}
-    {...props}
-  />
-);
diff --git a/src/components/atoms/button/index.ts b/src/components/atoms/button/index.ts
deleted file mode 100644
index a039b75..0000000
--- a/src/components/atoms/button/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Button } from './button';
diff --git a/src/components/atoms/labelled-value.astro b/src/components/atoms/labelled-value.astro
new file mode 100644
index 0000000..13ecddb
--- /dev/null
+++ b/src/components/atoms/labelled-value.astro
@@ -0,0 +1,13 @@
+---
+export interface Props extends astroHTML.JSX.HTMLAttributes {
+  label: string;
+  value: string;
+}
+
+const { label, value, ...props } = Astro.props;
+---
+
+<div {...props} class:list={['text-base space-x-1', props.class]}>
+  <span class="font-medium text-gray-700">{label}:</span>
+  <span class="font-normal text-gray-500">{value}</span>
+</div>
diff --git a/src/components/atoms/labelled-value/index.ts b/src/components/atoms/labelled-value/index.ts
deleted file mode 100644
index 82a8f71..0000000
--- a/src/components/atoms/labelled-value/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { LabelledValue } from './labelled-value';
diff --git a/src/components/atoms/labelled-value/labelled-value.stories.tsx b/src/components/atoms/labelled-value/labelled-value.stories.tsx
deleted file mode 100644
index fca6c5c..0000000
--- a/src/components/atoms/labelled-value/labelled-value.stories.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ComponentMeta, ComponentStory } from '@storybook/react';
-
-import * as C from './labelled-value';
-
-export default {
-  title: 'LabelledValue',
-  component: C.LabelledValue,
-} as ComponentMeta<typeof C.LabelledValue>;
-
-export const LabelledValue: ComponentStory<typeof C.LabelledValue> = (args) => <C.LabelledValue {...args} />;
-
-LabelledValue.args = {
-  label: 'Label',
-  children: 'Value',
-};
diff --git a/src/components/atoms/labelled-value/labelled-value.tsx b/src/components/atoms/labelled-value/labelled-value.tsx
deleted file mode 100644
index c414766..0000000
--- a/src/components/atoms/labelled-value/labelled-value.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import clsx from 'clsx';
-import type { ComponentPropsWithoutRef } from 'react';
-
-interface LabelledValueProps extends ComponentPropsWithoutRef<'div'> {
-  label: string;
-}
-
-export const LabelledValue = ({ label, children, className, ...props }: LabelledValueProps) => (
-  <div className={clsx('text-base space-x-1', className)} {...props}>
-    <span className="font-medium text-gray-700">{label}:</span>
-    <span className="font-normal text-gray-500">{children}</span>
-  </div>
-);
diff --git a/src/components/atoms/section-card.astro b/src/components/atoms/section-card.astro
new file mode 100644
index 0000000..9ff470e
--- /dev/null
+++ b/src/components/atoms/section-card.astro
@@ -0,0 +1,7 @@
+---
+export interface Props extends astroHTML.JSX.HTMLAttributes {}
+
+const props = Astro.props;
+---
+
+<div {...props} class:list={['p-8 bg-white rounded-2xl shadow-lg', props.class]}><slot /></div>
diff --git a/src/components/atoms/section-card/index.ts b/src/components/atoms/section-card/index.ts
deleted file mode 100644
index 8e75dbb..0000000
--- a/src/components/atoms/section-card/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SectionCard } from './section-card';
diff --git a/src/components/atoms/section-card/section-card.stories.tsx b/src/components/atoms/section-card/section-card.stories.tsx
deleted file mode 100644
index b8636f7..0000000
--- a/src/components/atoms/section-card/section-card.stories.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { ComponentMeta, ComponentStory } from '@storybook/react';
-
-import * as C from './section-card';
-
-export default {
-  title: 'SectionCard',
-  component: C.SectionCard,
-} as ComponentMeta<typeof C.SectionCard>;
-
-export const SectionCard: ComponentStory<typeof C.SectionCard> = (args) => <C.SectionCard {...args} />;
-
-SectionCard.args = {
-  children: 'Card content',
-};
diff --git a/src/components/atoms/section-card/section-card.tsx b/src/components/atoms/section-card/section-card.tsx
deleted file mode 100644
index e15dea1..0000000
--- a/src/components/atoms/section-card/section-card.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import clsx from 'clsx';
-import type { ComponentPropsWithoutRef } from 'react';
-
-interface SectionCardProps extends ComponentPropsWithoutRef<'div'> {}
-
-export const SectionCard = ({ className, ...props }: SectionCardProps) => (
-  <div className={clsx('p-8 bg-white rounded-2xl shadow-lg', className)} {...props} />
-);
diff --git a/src/components/atoms/typography/typography.tsx b/src/components/atoms/typography.astro
similarity index 73%
rename from src/components/atoms/typography/typography.tsx
rename to src/components/atoms/typography.astro
index d3113ba..20421e5 100644
--- a/src/components/atoms/typography/typography.tsx
+++ b/src/components/atoms/typography.astro
@@ -1,6 +1,4 @@
-import clsx from 'clsx';
-import type { ComponentPropsWithoutRef } from 'react';
-
+---
 type TypographyVariant =
   | 'item-title'
   | 'item-subtitle'
@@ -12,10 +10,6 @@ type TypographyVariant =
   | 'section-subtitle'
   | 'paragraph';
 
-interface TypographyProps extends ComponentPropsWithoutRef<'div'> {
-  variant?: TypographyVariant;
-}
-
 const variantToElement = {
   'main-title': 'h1',
   'main-subtitle': 'h2',
@@ -40,8 +34,12 @@ const variantToClassName = {
   paragraph: 'text-base leading-relaxed font-normal text-gray-500',
 };
 
-export const Typography = ({ variant = 'paragraph', className, ...props }: TypographyProps) => {
-  const Element = variantToElement[variant];
+export interface Props extends Omit<astroHTML.JSX.HTMLAttributes, 'slot'> {
+  variant?: TypographyVariant;
+}
 
-  return <Element className={clsx(variantToClassName[variant], className)} {...props} />;
-};
+const { variant = 'paragraph', ...props } = Astro.props;
+const Element = variantToElement[variant];
+---
+
+<Element {...props} class:list={[variantToClassName[variant], props.class]}><slot /></Element>
diff --git a/src/components/atoms/typography/index.ts b/src/components/atoms/typography/index.ts
deleted file mode 100644
index 6b7e7c9..0000000
--- a/src/components/atoms/typography/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Typography } from './typography';
diff --git a/src/components/atoms/typography/typography.stories.tsx b/src/components/atoms/typography/typography.stories.tsx
deleted file mode 100644
index ff52988..0000000
--- a/src/components/atoms/typography/typography.stories.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ComponentMeta, ComponentStory } from '@storybook/react';
-
-import * as C from './typography';
-
-export default {
-  title: 'Typography',
-  component: C.Typography,
-} as ComponentMeta<typeof C.Typography>;
-
-export const Typography: ComponentStory<typeof C.Typography> = (args) => <C.Typography {...args} />;
-
-Typography.args = {
-  children: 'Typography text',
-  variant: 'paragraph',
-};
diff --git a/src/components/sections/experience-section.astro b/src/components/sections/experience-section.astro
new file mode 100644
index 0000000..d322f79
--- /dev/null
+++ b/src/components/sections/experience-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { ExperienceSection } from '@/types/experience-section';
+
+export interface Props extends ExperienceSection {}
+---
+
+<SectionCard>Experience section</SectionCard>
diff --git a/src/components/sections/experience/experience-section.tsx b/src/components/sections/experience/experience-section.tsx
deleted file mode 100644
index 74eb295..0000000
--- a/src/components/sections/experience/experience-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { ExperienceSection as ExperienceSectionProps } from '@/types/experience-section';
-
-export const ExperienceSection = (props: ExperienceSectionProps) => <SectionCard>Experience section</SectionCard>;
diff --git a/src/components/sections/experience/index.ts b/src/components/sections/experience/index.ts
deleted file mode 100644
index fe825c4..0000000
--- a/src/components/sections/experience/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ExperienceSection } from './experience-section';
diff --git a/src/components/sections/favorites-section.astro b/src/components/sections/favorites-section.astro
new file mode 100644
index 0000000..e7b3644
--- /dev/null
+++ b/src/components/sections/favorites-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { FavoritesSection } from '@/types/favorites-section';
+
+export interface Props extends FavoritesSection {}
+---
+
+<SectionCard>Favorites section</SectionCard>
diff --git a/src/components/sections/favorites/favorites-section.tsx b/src/components/sections/favorites/favorites-section.tsx
deleted file mode 100644
index eebba44..0000000
--- a/src/components/sections/favorites/favorites-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { FavoritesSection as FavoritesSectionProps } from '@/types/favorites-section';
-
-export const FavoritesSection = (props: FavoritesSectionProps) => <SectionCard>Favorites section</SectionCard>;
diff --git a/src/components/sections/favorites/index.ts b/src/components/sections/favorites/index.ts
deleted file mode 100644
index 0c0af80..0000000
--- a/src/components/sections/favorites/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { FavoritesSection } from './favorites-section';
diff --git a/src/components/sections/main-section.astro b/src/components/sections/main-section.astro
new file mode 100644
index 0000000..7d4b197
--- /dev/null
+++ b/src/components/sections/main-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { MainSection } from '@/types/main-section';
+
+export interface Props extends MainSection {}
+---
+
+<SectionCard>Main section</SectionCard>
diff --git a/src/components/sections/main/index.ts b/src/components/sections/main/index.ts
deleted file mode 100644
index ffde7f5..0000000
--- a/src/components/sections/main/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MainSection } from './main-section';
diff --git a/src/components/sections/main/main-section.tsx b/src/components/sections/main/main-section.tsx
deleted file mode 100644
index d21e829..0000000
--- a/src/components/sections/main/main-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { MainSection as MainSectionProps } from '@/types/main-section';
-
-export const MainSection = (props: MainSectionProps) => <SectionCard>Main section</SectionCard>;
diff --git a/src/components/sections/portfolio-section.astro b/src/components/sections/portfolio-section.astro
new file mode 100644
index 0000000..63deff1
--- /dev/null
+++ b/src/components/sections/portfolio-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { PortfolioSection } from '@/types/portfolio-section';
+
+export interface Props extends PortfolioSection {}
+---
+
+<SectionCard>Portfolio section</SectionCard>
diff --git a/src/components/sections/portfolio/index.ts b/src/components/sections/portfolio/index.ts
deleted file mode 100644
index d1885d8..0000000
--- a/src/components/sections/portfolio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PortfolioSection } from './portfolio-section';
diff --git a/src/components/sections/portfolio/portfolio-section.tsx b/src/components/sections/portfolio/portfolio-section.tsx
deleted file mode 100644
index 6b5d6f7..0000000
--- a/src/components/sections/portfolio/portfolio-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { PortfolioSection as PortfolioSectionProps } from '@/types/portfolio-section';
-
-export const PortfolioSection = (props: PortfolioSectionProps) => <SectionCard>Portfolio section</SectionCard>;
diff --git a/src/components/sections/skills-section.astro b/src/components/sections/skills-section.astro
new file mode 100644
index 0000000..02cebdc
--- /dev/null
+++ b/src/components/sections/skills-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { SkillsSection } from '@/types/skills-section';
+
+export interface Props extends SkillsSection {}
+---
+
+<SectionCard>Skills section</SectionCard>
diff --git a/src/components/sections/skills/index.ts b/src/components/sections/skills/index.ts
deleted file mode 100644
index 6c700da..0000000
--- a/src/components/sections/skills/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SkillsSection } from './skills-section';
diff --git a/src/components/sections/skills/skills-section.tsx b/src/components/sections/skills/skills-section.tsx
deleted file mode 100644
index 6695388..0000000
--- a/src/components/sections/skills/skills-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { SkillsSection as SkillsSectionProps } from '@/types/skills-section';
-
-export const SkillsSection = (props: SkillsSectionProps) => <SectionCard>Skills section</SectionCard>;
diff --git a/src/components/sections/testimonials-section.astro b/src/components/sections/testimonials-section.astro
new file mode 100644
index 0000000..f35dda4
--- /dev/null
+++ b/src/components/sections/testimonials-section.astro
@@ -0,0 +1,8 @@
+---
+import SectionCard from '@/atoms/section-card.astro';
+import type { TestimonialsSection } from '@/types/testimonials-section';
+
+export interface Props extends TestimonialsSection {}
+---
+
+<SectionCard>Testimonials section</SectionCard>
diff --git a/src/components/sections/testimonials/index.ts b/src/components/sections/testimonials/index.ts
deleted file mode 100644
index a1b341b..0000000
--- a/src/components/sections/testimonials/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TestimonialsSection } from './testimonials-section';
diff --git a/src/components/sections/testimonials/testimonials-section.tsx b/src/components/sections/testimonials/testimonials-section.tsx
deleted file mode 100644
index d2cfa67..0000000
--- a/src/components/sections/testimonials/testimonials-section.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SectionCard } from '@/atoms/section-card';
-import type { TestimonialsSection as TestimonialsSectionProps } from '@/types/testimonials-section';
-
-export const TestimonialsSection = (props: TestimonialsSectionProps) => <SectionCard>Testimonials section</SectionCard>;
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 841ae94..4b433e1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,10 +1,10 @@
 ---
-import { ExperienceSection } from '@/sections/experience';
-import { FavoritesSection } from '@/sections/favorites';
-import { MainSection } from '@/sections/main';
-import { PortfolioSection } from '@/sections/portfolio';
-import { SkillsSection } from '@/sections/skills';
-import { TestimonialsSection } from '@/sections/testimonials';
+import ExperienceSection from '@/sections/experience-section.astro';
+import FavoritesSection from '@/sections/favorites-section.astro';
+import MainSection from '@/sections/main-section.astro';
+import PortfolioSection from '@/sections/portfolio-section.astro';
+import SkillsSection from '@/sections/skills-section.astro';
+import TestimonialsSection from '@/sections/testimonials-section.astro';
 import { data } from '../data';
 ---