diff --git a/EventModelingConference2026/Core/.frontend/index.css b/EventModelingConference2026/Core/.frontend/index.css
index fd30699..0d3d130 100644
--- a/EventModelingConference2026/Core/.frontend/index.css
+++ b/EventModelingConference2026/Core/.frontend/index.css
@@ -2,7 +2,7 @@
 @import "tailwindcss";
 @source "../";
 @source "../../../node_modules/@cratis/components/dist";
-@import 'primereact/resources/themes/lara-dark-blue/theme.css';
+@import '../public/themes/lara-dark-blue/theme.css';
 
 :root {
   font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
@@ -41,7 +41,7 @@ body {
   min-width: 320px;
   min-height: 100vh;
   background-color: var(--surface-ground);
-  color: var(--highlight-text-color);
+  color: var(--text-color);
 }
 
 h1 {
diff --git a/EventModelingConference2026/Core/.frontend/index.tsx b/EventModelingConference2026/Core/.frontend/index.tsx
index 2c335ef..10b3735 100644
--- a/EventModelingConference2026/Core/.frontend/index.tsx
+++ b/EventModelingConference2026/Core/.frontend/index.tsx
@@ -2,17 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import 'reflect-metadata';
-import { PrimeReactProvider } from 'primereact/api';
 import ReactDOM from 'react-dom/client';
-import 'primeicons/primeicons.css';
 import './index.css';
 import React from 'react';
 import App from "./App";
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
     <React.StrictMode>
-        <PrimeReactProvider value={{ ripple: true }}>
-            <App />
-        </PrimeReactProvider>
+        <App />
     </React.StrictMode>
 );
diff --git a/EventModelingConference2026/Core/Employment/Employees/Employees.tsx b/EventModelingConference2026/Core/Employment/Employees/Employees.tsx
index b4b9ca2..68f0381 100644
--- a/EventModelingConference2026/Core/Employment/Employees/Employees.tsx
+++ b/EventModelingConference2026/Core/Employment/Employees/Employees.tsx
@@ -2,8 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { ComponentType } from 'react';
-import { Column } from 'primereact/column';
-import { DataPage, MenuItem } from '@cratis/components/DataPage';
+import { DataPage, MenuItem, Column } from '@cratis/components/DataPage';
 import { useDialog } from '@cratis/arc.react/dialogs';
 import * as mdIcons from 'react-icons/md';
 import { ObserveAll } from './Listing/ObserveAll';
diff --git a/EventModelingConference2026/Core/Layout/Default/Sidebar/MenuItem/MenuItem.tsx b/EventModelingConference2026/Core/Layout/Default/Sidebar/MenuItem/MenuItem.tsx
index fdf1a62..d238668 100644
--- a/EventModelingConference2026/Core/Layout/Default/Sidebar/MenuItem/MenuItem.tsx
+++ b/EventModelingConference2026/Core/Layout/Default/Sidebar/MenuItem/MenuItem.tsx
@@ -3,7 +3,6 @@
 
 import { generatePath, NavLink, useParams } from "react-router-dom";
 import css from "./MenuItem.module.css";
-import { Ripple } from "primereact/ripple";
 import { IconType } from "react-icons/lib";
 import { useLayoutContext } from "../../context/LayoutContext";
 import { useContext, useEffect, useState } from "react";
@@ -41,9 +40,8 @@ export const MenuItem = ({ item, basePath, ...rest }: IMenuItemProps) => {
         <NavLink to={resolvedPath}
                  {...rest}
                  className={({ isActive, isPending }) =>
-                     css.menuItem + ' ' + (isPending ? css.pending : isActive ? css.active : "") + " p-ripple "
+                     css.menuItem + ' ' + (isPending ? css.pending : isActive ? css.active : "")
                  }>
-            <Ripple/>
             <div className={css.icon}>
                 {item.icon && <item.icon size='1.5rem'/>}
             </div>
diff --git a/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.module.css b/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.module.css
index cbe5d75..91d1d6e 100644
--- a/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.module.css
+++ b/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.module.css
@@ -22,9 +22,19 @@
 }
 
 .hamburgerMenuButton {
+  background: transparent;
+  border: 0;
+  color: inherit;
+  cursor: pointer;
+  padding: 0.75rem 1rem;
+  border-radius: var(--border-radius);
   outline: none !important;
 }
 
+.hamburgerMenuButton:hover {
+  background: var(--surface-c);
+}
+
 .hamburgerMenuButton:focus,
 .hamburgerMenuButton:active {
   box-shadow: none !important;
diff --git a/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.tsx b/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.tsx
index 2bd25d0..c6f617e 100644
--- a/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.tsx
+++ b/EventModelingConference2026/Core/Layout/Default/TopBar/TopBar.tsx
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { useLayoutContext } from '../context/LayoutContext';
-import { Button } from 'primereact/button';
 import css from './TopBar.module.css';
 import { FaBars } from 'react-icons/fa6';
 
@@ -13,12 +12,13 @@ export const TopBar = () => {
         <div className={css.container}>
             <div className={`flex items-center justify-between ${css.leftSide}`}>
                 <div className={css.sidebarToggle}>
-                    <Button
+                    <button
+                        type="button"
+                        aria-label="Toggle sidebar"
                         onClick={toggleLeftSidebarOpen}
-                        text
                         className={css.hamburgerMenuButton}>
                         <FaBars />
-                    </Button>
+                    </button>
                 </div>
                 <div className="flex-1 flex align-center justify-center">
                     <div className="font-extrabold text-2xl m-2">Library</div>
diff --git a/EventModelingConference2026/Core/package.json b/EventModelingConference2026/Core/package.json
index 0b806c0..e87e421 100644
--- a/EventModelingConference2026/Core/package.json
+++ b/EventModelingConference2026/Core/package.json
@@ -24,8 +24,6 @@
     "echarts": "6.1.0",
     "mobx": "7.0.6",
     "mobx-react": "10.0.2",
-    "primeicons": "8.0.2",
-    "primereact": "11.2.0",
     "react": "19.3.1",
     "react-dom": "19.3.1",
     "react-icons": "5.7.0",