diff --git a/src/layout/AppMenuItem.vue b/src/layout/AppMenuItem.vue
index 8d748c1..95a7442 100644
--- a/src/layout/AppMenuItem.vue
+++ b/src/layout/AppMenuItem.vue
@@ -27,11 +27,11 @@ defineProps({
             <span class="layout-menuitem-text">{{ item.label }}</span>
             <i class="pi pi-fw pi-angle-down layout-submenu-toggler" v-if="item.items"></i>
         </a>
-        <a v-if="item.to && !item.items && item.visible !== false" @click="itemClick($event)" :class="item.class" tabindex="0" :to="item.to">
+        <router-link v-if="item.to && !item.items && item.visible !== false" @click="itemClick($event)" :class="[item.class, { 'active-route': active }]" tabindex="0" :to="item.to">
             <i :class="item.icon" class="layout-menuitem-icon"></i>
             <span class="layout-menuitem-text">{{ item.label }}</span>
             <i class="pi pi-fw pi-angle-down layout-submenu-toggler" v-if="item.items"></i>
-        </a>
+        </router-link>
         <Transition class="layout-submenu">
             <ul v-if="item.items && item.visible !== false">
                 <app-menu-item v-for="(child, i) in item.items" :key="child" :index="i" :item="child" :root="false"></app-menu-item>
diff --git a/src/layout/service/NodeService.js b/src/layout/service/NodeService.js
index cf9f026..9a047ca 100755
--- a/src/layout/service/NodeService.js
+++ b/src/layout/service/NodeService.js
@@ -1,11 +1,13 @@
 export default class NodeService {
-
-    getTreeTableNodes() {
-        return fetch('data/treetablenodes.json').then(res => res.json()).then(d => d.root);
+    getTreeTableNodes () {
+        return fetch('/data/treetablenodes.json')
+            .then(res => res.json())
+            .then(d => d.root);
     }
 
-    getTreeNodes() {
-        return fetch('data/treenodes.json').then(res => res.json()).then(d => d.root);
+    getTreeNodes () {
+        return fetch('/data/treenodes.json')
+            .then(res => res.json())
+            .then(d => d.root);
     }
-    
 }
diff --git a/src/layout/service/PhotoService.js b/src/layout/service/PhotoService.js
index a923afa..4611f84 100644
--- a/src/layout/service/PhotoService.js
+++ b/src/layout/service/PhotoService.js
@@ -1,7 +1,7 @@
 export default class PhotoService {
-
-    getImages() {
-        return fetch('data/photos.json').then(res => res.json())
-                .then(d => d.data);
+    getImages () {
+        return fetch('/data/photos.json')
+            .then(res => res.json())
+            .then(d => d.data);
     }
 }
diff --git a/src/layout/service/ProductService.js b/src/layout/service/ProductService.js
index 5dead4d..3be066c 100644
--- a/src/layout/service/ProductService.js
+++ b/src/layout/service/ProductService.js
@@ -1,15 +1,19 @@
 export default class ProductService {
-
-    getProductsSmall() {
-		return fetch('data/products-small.json').then(res => res.json()).then(d => d.data);
-	}
-
-	getProducts() {
-		return fetch('data/products.json').then(res => res.json()).then(d => d.data);
+    getProductsSmall () {
+        return fetch('/data/products-small.json')
+            .then(res => res.json())
+            .then(d => d.data);
     }
 
-    getProductsWithOrdersSmall() {
-		return fetch('data/products-orders-small.json').then(res => res.json()).then(d => d.data);
-	}
-	
-}
\ No newline at end of file
+    getProducts () {
+        return fetch('/data/products.json')
+            .then(res => res.json())
+            .then(d => d.data);
+    }
+
+    getProductsWithOrdersSmall () {
+        return fetch('/data/products-orders-small.json')
+            .then(res => res.json())
+            .then(d => d.data);
+    }
+}
diff --git a/src/router/index.js b/src/router/index.js
index 4040bff..378614a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,65 +9,85 @@ const router = createRouter({
             component: AppLayout,
             children: [
                 {
-                    path: '',
+                    path: '/',
                     name: 'dashboard',
                     component: () => import('@/views/Dashboard.vue')
                 },
                 {
-                    path: '/formlayout',
+                    path: '/uikit/formlayout',
                     name: 'formlayout',
                     component: () => import('@/views/demo/FormLayout.vue')
                 },
                 {
-                    path: '/input',
+                    path: '/uikit/input',
                     name: 'input',
                     component: () => import('@/views/demo/Input.vue')
                 },
                 {
-                    path: '/floatlabel',
+                    path: '/uikit/floatlabel',
                     name: 'floatlabel',
                     component: () => import('@/views/demo/FloatLabel.vue')
                 },
                 {
-                    path: '/invalidstate',
+                    path: '/uikit/invalidstate',
                     name: 'invalidstate',
                     component: () => import('@/views/demo/InvalidState.vue')
                 },
                 {
-                    path: '/button',
+                    path: '/uikit/button',
                     name: 'button',
                     component: () => import('@/views/demo/Button.vue')
                 },
                 {
-                    path: '/table',
+                    path: '/uikit/table',
                     name: 'table',
                     component: () => import('@/views/demo/Table.vue')
                 },
                 {
-                    path: '/list',
+                    path: '/uikit/list',
                     name: 'list',
                     component: () => import('@/views/demo/List.vue')
                 },
                 {
-                    path: '/tree',
+                    path: '/uikit/tree',
                     name: 'tree',
                     component: () => import('@/views/demo/Tree.vue')
                 },
                 {
-                    path: '/panel',
+                    path: '/uikit/panel',
                     name: 'panel',
                     component: () => import('@/views/demo/Panels.vue')
                 },
 
                 {
-                    path: '/overlay',
+                    path: '/uikit/overlay',
                     name: 'overlay',
                     component: () => import('@/views/demo/Overlay.vue')
                 },
                 {
-                    path: '/media',
+                    path: '/uikit/media',
                     name: 'media',
                     component: () => import('@/views/demo/Media.vue')
+                },
+                {
+                    path: '/uikit/menu',
+                    name: 'menu',
+                    component: () => import('@/views/demo/Menu.vue')
+                },
+                {
+                    path: '/uikit/message',
+                    name: 'message',
+                    component: () => import('@/views/demo/Messages.vue')
+                },
+                {
+                    path: '/uikit/file',
+                    name: 'file',
+                    component: () => import('@/views/demo/File.vue')
+                },
+                {
+                    path: '/uikit/misc',
+                    name: 'misc',
+                    component: () => import('@/views/demo/Misc.vue')
                 }
                 /*
                
@@ -75,12 +95,12 @@ const router = createRouter({
            
                
                 {
-                    path: '/overlay',
+                    path: '/uikit/overlay',
                     name: 'overlay',
                     component: () => import('./components/OverlayDemo.vue')
                 },
                 {
-                    path: '/media',
+                    path: '/uikit/media',
                     name: 'media',
                     component: () => import('./components/MediaDemo.vue')
                 } */
diff --git a/src/views/demo/Chart.vue b/src/views/demo/Chart.vue
new file mode 100644
index 0000000..db0cb8c
--- /dev/null
+++ b/src/views/demo/Chart.vue
@@ -0,0 +1,357 @@
+<template>
+    <div class="grid p-fluid">
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h5>Linear Chart</h5>
+                <Chart type="line" :data="lineData" :options="lineOptions" />
+            </div>
+
+            <div class="card flex flex-column align-items-center">
+                <h5 class="align-self-start">Pie Chart</h5>
+                <Chart type="pie" :data="pieData" :options="pieOptions" style="width: 50%" />
+            </div>
+
+            <div class="card flex flex-column align-items-center">
+                <h5 class="align-self-start">Polar Area Chart</h5>
+                <Chart type="polarArea" :data="polarData" :options="polarOptions" style="width: 50%" />
+            </div>
+        </div>
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h5>Bar Chart</h5>
+                <Chart type="bar" :data="barData" :options="barOptions" />
+            </div>
+
+            <div class="card flex flex-column align-items-center">
+                <h5 class="align-self-start">Doughnut Chart</h5>
+                <Chart type="doughnut" :data="pieData" :options="pieOptions" style="width: 50%" />
+            </div>
+
+            <div class="card flex flex-column align-items-center">
+                <h5 class="align-self-start">Radar Chart</h5>
+                <Chart type="radar" :data="radarData" :options="radarOptions" style="width: 50%" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import EventBus from '@/AppEventBus';
+
+export default {
+    themeChangeListener: null,
+    mounted() {
+        this.themeChangeListener = (event) => {
+            if (event.dark) this.applyDarkTheme();
+            else this.applyLightTheme();
+        };
+        EventBus.on('change-theme', this.themeChangeListener);
+
+        if (this.isDarkTheme()) {
+            this.applyDarkTheme();
+        } else {
+            this.applyLightTheme();
+        }
+    },
+    beforeUnmount() {
+        EventBus.off('change-theme', this.themeChangeListener);
+    },
+    data() {
+        return {
+            lineData: {
+                labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
+                datasets: [
+                    {
+                        label: 'First Dataset',
+                        data: [65, 59, 80, 81, 56, 55, 40],
+                        fill: false,
+                        backgroundColor: '#2f4860',
+                        borderColor: '#2f4860',
+                        tension: 0.4
+                    },
+                    {
+                        label: 'Second Dataset',
+                        data: [28, 48, 40, 19, 86, 27, 90],
+                        fill: false,
+                        backgroundColor: '#00bb7e',
+                        borderColor: '#00bb7e',
+                        tension: 0.4
+                    }
+                ]
+            },
+            pieData: {
+                labels: ['A', 'B', 'C'],
+                datasets: [
+                    {
+                        data: [300, 50, 100],
+                        backgroundColor: ['#FF6384', '#36A2EB', '#FFCE56'],
+                        hoverBackgroundColor: ['#FF6384', '#36A2EB', '#FFCE56']
+                    }
+                ]
+            },
+            polarData: {
+                datasets: [
+                    {
+                        data: [11, 16, 7, 3, 14],
+                        backgroundColor: ['#FF6384', '#4BC0C0', '#FFCE56', '#E7E9ED', '#36A2EB'],
+                        label: 'My dataset'
+                    }
+                ],
+                labels: ['Red', 'Green', 'Yellow', 'Grey', 'Blue']
+            },
+            barData: {
+                labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
+                datasets: [
+                    {
+                        label: 'My First dataset',
+                        backgroundColor: '#2f4860',
+                        data: [65, 59, 80, 81, 56, 55, 40]
+                    },
+                    {
+                        label: 'My Second dataset',
+                        backgroundColor: '#00bb7e',
+                        data: [28, 48, 40, 19, 86, 27, 90]
+                    }
+                ]
+            },
+            radarData: {
+                labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
+                datasets: [
+                    {
+                        label: 'My First dataset',
+                        backgroundColor: 'rgba(179,181,198,0.2)',
+                        borderColor: 'rgba(179,181,198,1)',
+                        pointBackgroundColor: 'rgba(179,181,198,1)',
+                        pointBorderColor: '#fff',
+                        pointHoverBackgroundColor: '#fff',
+                        pointHoverBorderColor: 'rgba(179,181,198,1)',
+                        data: [65, 59, 90, 81, 56, 55, 40]
+                    },
+                    {
+                        label: 'My Second dataset',
+                        backgroundColor: 'rgba(255,99,132,0.2)',
+                        borderColor: 'rgba(255,99,132,1)',
+                        pointBackgroundColor: 'rgba(255,99,132,1)',
+                        pointBorderColor: '#fff',
+                        pointHoverBackgroundColor: '#fff',
+                        pointHoverBorderColor: 'rgba(255,99,132,1)',
+                        data: [28, 48, 40, 19, 96, 27, 100]
+                    }
+                ]
+            },
+            lineOptions: null,
+            pieOptions: null,
+            polarOptions: null,
+            barOptions: null,
+            radarOptions: null
+        };
+    },
+    methods: {
+        isDarkTheme() {
+            return this.$appState.darkTheme === true;
+        },
+        applyLightTheme() {
+            this.lineOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#495057'
+                        }
+                    }
+                },
+                scales: {
+                    x: {
+                        ticks: {
+                            color: '#495057'
+                        },
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    },
+                    y: {
+                        ticks: {
+                            color: '#495057'
+                        },
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    }
+                }
+            };
+
+            this.barOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#495057'
+                        }
+                    }
+                },
+                scales: {
+                    x: {
+                        ticks: {
+                            color: '#495057'
+                        },
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    },
+                    y: {
+                        ticks: {
+                            color: '#495057'
+                        },
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    }
+                }
+            };
+
+            this.pieOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#495057'
+                        }
+                    }
+                }
+            };
+
+            this.polarOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#495057'
+                        }
+                    }
+                },
+                scales: {
+                    r: {
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    }
+                }
+            };
+
+            this.radarOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#495057'
+                        }
+                    }
+                },
+                scales: {
+                    r: {
+                        grid: {
+                            color: '#ebedef'
+                        }
+                    }
+                }
+            };
+        },
+        applyDarkTheme() {
+            this.lineOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#ebedef'
+                        }
+                    }
+                },
+                scales: {
+                    x: {
+                        ticks: {
+                            color: '#ebedef'
+                        },
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    },
+                    y: {
+                        ticks: {
+                            color: '#ebedef'
+                        },
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    }
+                }
+            };
+
+            this.barOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#ebedef'
+                        }
+                    }
+                },
+                scales: {
+                    x: {
+                        ticks: {
+                            color: '#ebedef'
+                        },
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    },
+                    y: {
+                        ticks: {
+                            color: '#ebedef'
+                        },
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    }
+                }
+            };
+
+            this.pieOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#ebedef'
+                        }
+                    }
+                }
+            };
+
+            this.polarOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#ebedef'
+                        }
+                    }
+                },
+                scales: {
+                    r: {
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    }
+                }
+            };
+
+            this.radarOptions = {
+                plugins: {
+                    legend: {
+                        labels: {
+                            color: '#ebedef'
+                        }
+                    }
+                },
+                scales: {
+                    r: {
+                        grid: {
+                            color: 'rgba(160, 167, 181, .3)'
+                        }
+                    }
+                }
+            };
+        }
+    }
+};
+</script>
diff --git a/src/views/demo/File.vue b/src/views/demo/File.vue
index 6d15337..59803d7 100644
--- a/src/views/demo/File.vue
+++ b/src/views/demo/File.vue
@@ -1,23 +1,23 @@
 <template>
-	<div class="grid">
-		<div class="col-12">
-			<div class="card">
-				<h5>Advanced</h5>
-				<FileUpload name="demo[]" url="./upload.php" @upload="onUpload" :multiple="true" accept="image/*" :maxFileSize="1000000"/>
+    <div class="grid">
+        <div class="col-12">
+            <div class="card">
+                <h5>Advanced</h5>
+                <FileUpload name="demo[]" url="./upload.php" @upload="onUpload" :multiple="true" accept="image/*" :maxFileSize="1000000" />
 
-				<h5>Basic</h5>
-				<FileUpload mode="basic" name="demo[]" url="./upload.php" accept="image/*" :maxFileSize="1000000" @upload="onUpload" />
-			</div>
-		</div>
-	</div>
+                <h5>Basic</h5>
+                <FileUpload mode="basic" name="demo[]" url="./upload.php" accept="image/*" :maxFileSize="1000000" @upload="onUpload" />
+            </div>
+        </div>
+    </div>
 </template>
 
-<script>
-	export default {
-		methods: {
-			onUpload() {
-				this.$toast.add({severity: 'info', summary: 'Success', detail: 'File Uploaded', life: 3000});
-			}
-		}
-	}
-</script>
\ No newline at end of file
+<script setup>
+import { useToast } from 'primevue/usetoast';
+
+const toast = useToast();
+
+const onUpload = () => {
+    toast.add({ severity: 'info', summary: 'Success', detail: 'File Uploaded', life: 3000 });
+};
+</script>
diff --git a/src/views/demo/FormLayout.vue b/src/views/demo/FormLayout.vue
index 3145cac..4cc2f80 100644
--- a/src/views/demo/FormLayout.vue
+++ b/src/views/demo/FormLayout.vue
@@ -1,124 +1,121 @@
 <template>
-	<div class="grid">
-		<div class="col-12 md:col-6">
-			<div class="card p-fluid">
-				<h5>Vertical</h5>
-				<div class="field">
-					<label for="name1">Name</label>
-					<InputText id="name1" type="text" />
-				</div>
-				<div class="field">
-					<label for="email1">Email</label>
-					<InputText id="email1" type="text" />
-				</div>
-				<div class="field">
-					<label for="age1">Age</label>
-					<InputText id="age1" type="text" />
-				</div>
-			</div>
+    <div class="grid">
+        <div class="col-12 md:col-6">
+            <div class="card p-fluid">
+                <h5>Vertical</h5>
+                <div class="field">
+                    <label for="name1">Name</label>
+                    <InputText id="name1" type="text" />
+                </div>
+                <div class="field">
+                    <label for="email1">Email</label>
+                    <InputText id="email1" type="text" />
+                </div>
+                <div class="field">
+                    <label for="age1">Age</label>
+                    <InputText id="age1" type="text" />
+                </div>
+            </div>
 
-			<div class="card p-fluid">
-				<h5>Vertical Grid</h5>
-				<div class="formgrid grid">
-					<div class="field col">
-						<label for="name2">Name</label>
-						<InputText id="name2" type="text" />
-					</div>
-					<div class="field col">
-						<label for="email2">Email</label>
-						<InputText id="email2" type="text" />
-					</div>
-				</div>
-			</div>
-		</div>
+            <div class="card p-fluid">
+                <h5>Vertical Grid</h5>
+                <div class="formgrid grid">
+                    <div class="field col">
+                        <label for="name2">Name</label>
+                        <InputText id="name2" type="text" />
+                    </div>
+                    <div class="field col">
+                        <label for="email2">Email</label>
+                        <InputText id="email2" type="text" />
+                    </div>
+                </div>
+            </div>
+        </div>
 
-		<div class="col-12 md:col-6">
-			<div class="card p-fluid">
-				<h5>Horizontal</h5>
-				<div class="field grid">
-					<label for="name3" class="col-12 mb-2 md:col-2 md:mb-0">Name</label>
-					<div class="col-12 md:col-10">
-						<InputText id="name3" type="text" />
-					</div>
-				</div>
-				<div class="field grid">
-					<label for="email3" class="col-12 mb-2 md:col-2 md:mb-0">Email</label>
-					<div class="col-12 md:col-10">
-						<InputText id="email3" type="text" />
-					</div>
-				</div>
-			</div>
+        <div class="col-12 md:col-6">
+            <div class="card p-fluid">
+                <h5>Horizontal</h5>
+                <div class="field grid">
+                    <label for="name3" class="col-12 mb-2 md:col-2 md:mb-0">Name</label>
+                    <div class="col-12 md:col-10">
+                        <InputText id="name3" type="text" />
+                    </div>
+                </div>
+                <div class="field grid">
+                    <label for="email3" class="col-12 mb-2 md:col-2 md:mb-0">Email</label>
+                    <div class="col-12 md:col-10">
+                        <InputText id="email3" type="text" />
+                    </div>
+                </div>
+            </div>
 
-			<div class="card">
-				<h5>Inline</h5>
-				<div class="formgroup-inline">
-					<div class="field">
-						<label for="firstname1" class="p-sr-only">Firstname</label>
-						<InputText id="firstname1" type="text" placeholder="Firstname"/>
-					</div>
-					<div class="field">
-						<label for="lastname1" class="p-sr-only">Lastname</label>
-						<InputText id="lastname1" type="text" placeholder="Lastname"/>
-					</div>
-					<Button label="Submit"></Button>
-				</div>
-			</div>
+            <div class="card">
+                <h5>Inline</h5>
+                <div class="formgroup-inline">
+                    <div class="field">
+                        <label for="firstname1" class="p-sr-only">Firstname</label>
+                        <InputText id="firstname1" type="text" placeholder="Firstname" />
+                    </div>
+                    <div class="field">
+                        <label for="lastname1" class="p-sr-only">Lastname</label>
+                        <InputText id="lastname1" type="text" placeholder="Lastname" />
+                    </div>
+                    <Button label="Submit"></Button>
+                </div>
+            </div>
 
-			<div class="card">
-				<h5>Help Text</h5>
-				<div class="field p-fluid">
-					<label for="username">Username</label>
-					<InputText id="username" type="text" />
-					<small>Enter your username to reset your password.</small>
-				</div>
-			</div>
-		</div>
+            <div class="card">
+                <h5>Help Text</h5>
+                <div class="field p-fluid">
+                    <label for="username">Username</label>
+                    <InputText id="username" type="text" />
+                    <small>Enter your username to reset your password.</small>
+                </div>
+            </div>
+        </div>
 
-		<div class="col-12">
-			<div class="card">
-				<h5>Advanced</h5>
-				<div class="p-fluid formgrid grid">
-					<div class="field col-12 md:col-6">
-						<label for="firstname2">Firstname</label>
-						<InputText id="firstname2" type="text"/>
-					</div>
-					<div class="field col-12 md:col-6">
-						<label for="lastname2">Lastname</label>
-						<InputText id="lastname2" type="text"/>
-					</div>
-					<div class="field col-12">
-						<label for="address">Address</label>
-						<Textarea id="address" rows="4"/>
-					</div>
-					<div class="field col-12 md:col-6">
-						<label for="city">City</label>
-						<InputText id="city" type="text" />
-					</div>
-					<div class="field col-12 md:col-3">
-						<label for="state">State</label>
-						<Dropdown id="state" v-model="dropdownItem" :options="dropdownItems" optionLabel="name" placeholder="Select One"></Dropdown>
-					</div>
-					<div class="field col-12 md:col-3">
-						<label for="zip">Zip</label>
-						<InputText id="zip" type="text"/>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+        <div class="col-12">
+            <div class="card">
+                <h5>Advanced</h5>
+                <div class="p-fluid formgrid grid">
+                    <div class="field col-12 md:col-6">
+                        <label for="firstname2">Firstname</label>
+                        <InputText id="firstname2" type="text" />
+                    </div>
+                    <div class="field col-12 md:col-6">
+                        <label for="lastname2">Lastname</label>
+                        <InputText id="lastname2" type="text" />
+                    </div>
+                    <div class="field col-12">
+                        <label for="address">Address</label>
+                        <Textarea id="address" rows="4" />
+                    </div>
+                    <div class="field col-12 md:col-6">
+                        <label for="city">City</label>
+                        <InputText id="city" type="text" />
+                    </div>
+                    <div class="field col-12 md:col-3">
+                        <label for="state">State</label>
+                        <Dropdown id="state" v-model="dropdownItem" :options="dropdownItems" optionLabel="name" placeholder="Select One"></Dropdown>
+                    </div>
+                    <div class="field col-12 md:col-3">
+                        <label for="zip">Zip</label>
+                        <InputText id="zip" type="text" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				dropdownItems: [
-					{name: 'Option 1', code: 'Option 1'},
-					{name: 'Option 2', code: 'Option 2'},
-					{name: 'Option 3', code: 'Option 3'}
-				],
-				dropdownItem: null
-			}
-		}
-	}
+<script setup>
+import { ref } from 'vue';
+
+const dropdownItems = ref([
+    { name: 'Option 1', code: 'Option 1' },
+    { name: 'Option 2', code: 'Option 2' },
+    { name: 'Option 3', code: 'Option 3' }
+]);
+
+const dropdownItem = ref(null);
 </script>
diff --git a/src/views/demo/Menu.vue b/src/views/demo/Menu.vue
index a906aaa..5c2c4de 100644
--- a/src/views/demo/Menu.vue
+++ b/src/views/demo/Menu.vue
@@ -1,546 +1,529 @@
 <template>
-	<div class="grid p-fluid">
-		<div class="col-12">
-			<div class="card card-w-title">
-				<h5>Menubar</h5>
-				<Menubar :model="nestedMenuitems">
-					<template #end>
-						<span class="p-input-icon-left">
-							<i class="pi pi-search" />
-							<InputText type="text" placeholder="Search" />
-						</span>
-					</template>
-				</Menubar>
-			</div>
-		</div>
+    <div class="grid p-fluid">
+        <div class="col-12">
+            <div class="card card-w-title">
+                <h5>Menubar</h5>
+                <Menubar :model="nestedMenuitems">
+                    <template #end>
+                        <span class="p-input-icon-left">
+                            <i class="pi pi-search" />
+                            <InputText type="text" placeholder="Search" />
+                        </span>
+                    </template>
+                </Menubar>
+            </div>
+        </div>
 
-		<div class="col-12">
-			<div class="card card-w-title">
-				<h5>Breadcrumb</h5>
-				<Breadcrumb :home="breadcrumbHome" :model="breadcrumbItems" />
-			</div>
-		</div>
+        <div class="col-12">
+            <div class="card card-w-title">
+                <h5>Breadcrumb</h5>
+                <Breadcrumb :home="breadcrumbHome" :model="breadcrumbItems" />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-6">
-			<div class="card card-w-title">
-				<h5>Steps</h5>
-				<p>Steps and TabMenu are integrated with the same child routes.</p>
-				<Steps :model="nestedRouteItems" :readonly="false" />
-				<router-view/>
-			</div>
-		</div>
+        <div class="col-12 md:col-6">
+            <div class="card card-w-title">
+                <h5>Steps</h5>
+                <p>Steps and TabMenu are integrated with the same child routes.</p>
+                <Steps :model="nestedRouteItems" :readonly="false" />
+                <router-view />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-6">
-			<div class="card card-w-title">
-				<h5>TabMenu</h5>
-				<p>Steps and TabMenu are integrated with the same child routes.</p>
-				<TabMenu :model="nestedRouteItems" />
-				<router-view/>
-			</div>
-		</div>
+        <div class="col-12 md:col-6">
+            <div class="card card-w-title">
+                <h5>TabMenu</h5>
+                <p>Steps and TabMenu are integrated with the same child routes.</p>
+                <TabMenu :model="nestedRouteItems" />
+                <router-view />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-4">
-			<div class="card">
-				<h5>Tiered Menu</h5>
-				<TieredMenu :model="tieredMenuItems" />
-			</div>
-		</div>
+        <div class="col-12 md:col-4">
+            <div class="card">
+                <h5>Tiered Menu</h5>
+                <TieredMenu :model="tieredMenuItems" />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-4">
-			<div class="card">
-				<h5>Plain Menu</h5>
-				<Menu :model="menuitems" />
-			</div>
-		</div>
+        <div class="col-12 md:col-4">
+            <div class="card">
+                <h5>Plain Menu</h5>
+                <Menu :model="menuitems" />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-4">
-			<div class="card">
-				<h5>Overlay Menu</h5>
+        <div class="col-12 md:col-4">
+            <div class="card">
+                <h5>Overlay Menu</h5>
 
-				<Menu ref="menu" :model="overlayMenuItems" :popup="true" />
-				<Button type="button" label="Options" icon="pi pi-angle-down" @click="toggleMenu" style="width: auto"/>
-			</div>
+                <Menu ref="menu" :model="overlayMenuItems" :popup="true" />
+                <Button type="button" label="Options" icon="pi pi-angle-down" @click="toggleMenu" style="width: auto" />
+            </div>
 
-			<div class="card" @contextmenu="onContextRightClick">
-				<h5>ContextMenu</h5>
-				Right click to display.
-				<ContextMenu ref="contextMenu" :model="contextMenuItems" />
-			</div>
-		</div>
+            <div class="card" @contextmenu="onContextRightClick">
+                <h5>ContextMenu</h5>
+                Right click to display.
+                <ContextMenu ref="contextMenu" :model="contextMenuItems" />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-6">
-			<div class="card">
-				<h5>MegaMenu - Horizontal</h5>
-				<MegaMenu :model="megamenuItems" />
+        <div class="col-12 md:col-6">
+            <div class="card">
+                <h5>MegaMenu - Horizontal</h5>
+                <MegaMenu :model="megamenuItems" />
 
-				<h5 style="margin-top: 1.55em">MegaMenu - Vertical</h5>
-				<MegaMenu :model="megamenuItems" orientation="vertical" />
-			</div>
-		</div>
+                <h5 style="margin-top: 1.55em">MegaMenu - Vertical</h5>
+                <MegaMenu :model="megamenuItems" orientation="vertical" />
+            </div>
+        </div>
 
-		<div class="col-12 md:col-6">
-			<div class="card">
-				<h5>PanelMenu</h5>
-				<PanelMenu :model="panelMenuitems" />
-			</div>
-		</div>
-
-	</div>
+        <div class="col-12 md:col-6">
+            <div class="card">
+                <h5>PanelMenu</h5>
+                <PanelMenu :model="panelMenuitems" />
+            </div>
+        </div>
+    </div>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				nestedMenuitems: [
-					{
-						label:'Customers',
-						icon:'pi pi-fw pi-table',
-						items:[
-							{
-								label:'New',
-								icon:'pi pi-fw pi-user-plus',
-								items:[
-									{
-										label:'Customer',
-										icon:'pi pi-fw pi-plus'
-									},
-									{
-										label:'Duplicate',
-										icon:'pi pi-fw pi-copy'
-									},
+<script setup>
+import { ref } from 'vue';
 
-								]
-							},
-							{
-								label:'Edit',
-								icon:'pi pi-fw pi-user-edit'
-							}
-						]
-					},
-					{
-						label:'Orders',
-						icon:'pi pi-fw pi-shopping-cart',
-						items:[
-							{
-								label:'View',
-								icon:'pi pi-fw pi-list'
-							},
-							{
-								label:'Search',
-								icon:'pi pi-fw pi-search'
-							},
+const menu = ref(null);
+const contextMenu = ref(null);
 
-						]
-					},
-					{
-						label:'Shipments',
-						icon:'pi pi-fw pi-envelope',
-						items:[
-							{
-								label:'Tracker',
-								icon:'pi pi-fw pi-compass'
+const nestedMenuitems = ref([
+    {
+        label: 'Customers',
+        icon: 'pi pi-fw pi-table',
+        items: [
+            {
+                label: 'New',
+                icon: 'pi pi-fw pi-user-plus',
+                items: [
+                    {
+                        label: 'Customer',
+                        icon: 'pi pi-fw pi-plus'
+                    },
+                    {
+                        label: 'Duplicate',
+                        icon: 'pi pi-fw pi-copy'
+                    }
+                ]
+            },
+            {
+                label: 'Edit',
+                icon: 'pi pi-fw pi-user-edit'
+            }
+        ]
+    },
+    {
+        label: 'Orders',
+        icon: 'pi pi-fw pi-shopping-cart',
+        items: [
+            {
+                label: 'View',
+                icon: 'pi pi-fw pi-list'
+            },
+            {
+                label: 'Search',
+                icon: 'pi pi-fw pi-search'
+            }
+        ]
+    },
+    {
+        label: 'Shipments',
+        icon: 'pi pi-fw pi-envelope',
+        items: [
+            {
+                label: 'Tracker',
+                icon: 'pi pi-fw pi-compass'
+            },
+            {
+                label: 'Map',
+                icon: 'pi pi-fw pi-map-marker'
+            },
+            {
+                label: 'Manage',
+                icon: 'pi pi-fw pi-pencil'
+            }
+        ]
+    },
+    {
+        label: 'Profile',
+        icon: 'pi pi-fw pi-user',
+        items: [
+            {
+                label: 'Settings',
+                icon: 'pi pi-fw pi-cog'
+            },
+            {
+                label: 'Billing',
+                icon: 'pi pi-fw pi-file'
+            }
+        ]
+    },
+    {
+        label: 'Quit',
+        icon: 'pi pi-fw pi-sign-out'
+    }
+]);
+const breadcrumbHome = ref({ icon: 'pi pi-home', to: '/' });
+const breadcrumbItems = ref([{ label: 'Computer' }, { label: 'Notebook' }, { label: 'Accessories' }, { label: 'Backpacks' }, { label: 'Item' }]);
+const nestedRouteItems = ref([
+    {
+        label: 'Personal',
+        to: '/menu'
+    },
+    {
+        label: 'Seat',
+        to: '/menu/seat'
+    },
+    {
+        label: 'Payment',
+        to: '/menu/payment'
+    },
+    {
+        label: 'Confirmation',
+        to: '/menu/confirmation'
+    }
+]);
+const tieredMenuItems = ref([
+    {
+        label: 'Customers',
+        icon: 'pi pi-fw pi-table',
+        items: [
+            {
+                label: 'New',
+                icon: 'pi pi-fw pi-user-plus',
+                items: [
+                    {
+                        label: 'Customer',
+                        icon: 'pi pi-fw pi-plus'
+                    },
+                    {
+                        label: 'Duplicate',
+                        icon: 'pi pi-fw pi-copy'
+                    }
+                ]
+            },
+            {
+                label: 'Edit',
+                icon: 'pi pi-fw pi-user-edit'
+            }
+        ]
+    },
+    {
+        label: 'Orders',
+        icon: 'pi pi-fw pi-shopping-cart',
+        items: [
+            {
+                label: 'View',
+                icon: 'pi pi-fw pi-list'
+            },
+            {
+                label: 'Search',
+                icon: 'pi pi-fw pi-search'
+            }
+        ]
+    },
+    {
+        label: 'Shipments',
+        icon: 'pi pi-fw pi-envelope',
+        items: [
+            {
+                label: 'Tracker',
+                icon: 'pi pi-fw pi-compass'
+            },
+            {
+                label: 'Map',
+                icon: 'pi pi-fw pi-map-marker'
+            },
+            {
+                label: 'Manage',
+                icon: 'pi pi-fw pi-pencil'
+            }
+        ]
+    },
+    {
+        label: 'Profile',
+        icon: 'pi pi-fw pi-user',
+        items: [
+            {
+                label: 'Settings',
+                icon: 'pi pi-fw pi-cog'
+            },
+            {
+                label: 'Billing',
+                icon: 'pi pi-fw pi-file'
+            }
+        ]
+    },
+    {
+        separator: true
+    },
+    {
+        label: 'Quit',
+        icon: 'pi pi-fw pi-sign-out'
+    }
+]);
+const overlayMenuItems = ref([
+    {
+        label: 'Save',
+        icon: 'pi pi-save'
+    },
+    {
+        label: 'Update',
+        icon: 'pi pi-refresh'
+    },
+    {
+        label: 'Delete',
+        icon: 'pi pi-trash'
+    },
+    {
+        separator: true
+    },
+    {
+        label: 'Home',
+        icon: 'pi pi-home'
+    }
+]);
+const menuitems = ref([
+    {
+        label: 'Customers',
+        items: [
+            {
+                label: 'New',
+                icon: 'pi pi-fw pi-plus'
+            },
+            {
+                label: 'Edit',
+                icon: 'pi pi-fw pi-user-edit'
+            }
+        ]
+    },
+    {
+        label: 'Orders',
+        items: [
+            {
+                label: 'View',
+                icon: 'pi pi-fw pi-list'
+            },
+            {
+                label: 'Search',
+                icon: 'pi pi-fw pi-search'
+            }
+        ]
+    }
+]);
+const contextMenuItems = ref([
+    {
+        label: 'Save',
+        icon: 'pi pi-save'
+    },
+    {
+        label: 'Update',
+        icon: 'pi pi-refresh'
+    },
+    {
+        label: 'Delete',
+        icon: 'pi pi-trash'
+    },
+    {
+        separator: true
+    },
+    {
+        label: 'Options',
+        icon: 'pi pi-cog'
+    }
+]);
+const megamenuItems = ref([
+    {
+        label: 'Fashion',
+        icon: 'pi pi-fw pi-tag',
+        items: [
+            [
+                {
+                    label: 'Woman',
+                    items: [{ label: 'Woman Item' }, { label: 'Woman Item' }, { label: 'Woman Item' }]
+                },
+                {
+                    label: 'Men',
+                    items: [{ label: 'Men Item' }, { label: 'Men Item' }, { label: 'Men Item' }]
+                }
+            ],
+            [
+                {
+                    label: 'Kids',
+                    items: [{ label: 'Kids Item' }, { label: 'Kids Item' }]
+                },
+                {
+                    label: 'Luggage',
+                    items: [{ label: 'Luggage Item' }, { label: 'Luggage Item' }, { label: 'Luggage Item' }]
+                }
+            ]
+        ]
+    },
+    {
+        label: 'Electronics',
+        icon: 'pi pi-fw pi-desktop',
+        items: [
+            [
+                {
+                    label: 'Computer',
+                    items: [{ label: 'Computer Item' }, { label: 'Computer Item' }]
+                },
+                {
+                    label: 'Camcorder',
+                    items: [{ label: 'Camcorder Item' }, { label: 'Camcorder Item' }, { label: 'Camcorder Item' }]
+                }
+            ],
+            [
+                {
+                    label: 'TV',
+                    items: [{ label: 'TV Item' }, { label: 'TV Item' }]
+                },
+                {
+                    label: 'Audio',
+                    items: [{ label: 'Audio Item' }, { label: 'Audio Item' }, { label: 'Audio Item' }]
+                }
+            ],
+            [
+                {
+                    label: 'Sports.7',
+                    items: [{ label: 'Sports.7.1' }, { label: 'Sports.7.2' }]
+                }
+            ]
+        ]
+    },
+    {
+        label: 'Furniture',
+        icon: 'pi pi-fw pi-image',
+        items: [
+            [
+                {
+                    label: 'Living Room',
+                    items: [{ label: 'Living Room Item' }, { label: 'Living Room Item' }]
+                },
+                {
+                    label: 'Kitchen',
+                    items: [{ label: 'Kitchen Item' }, { label: 'Kitchen Item' }, { label: 'Kitchen Item' }]
+                }
+            ],
+            [
+                {
+                    label: 'Bedroom',
+                    items: [{ label: 'Bedroom Item' }, { label: 'Bedroom Item' }]
+                },
+                {
+                    label: 'Outdoor',
+                    items: [{ label: 'Outdoor Item' }, { label: 'Outdoor Item' }, { label: 'Outdoor Item' }]
+                }
+            ]
+        ]
+    },
+    {
+        label: 'Sports',
+        icon: 'pi pi-fw pi-star',
+        items: [
+            [
+                {
+                    label: 'Basketball',
+                    items: [{ label: 'Basketball Item' }, { label: 'Basketball Item' }]
+                },
+                {
+                    label: 'Football',
+                    items: [{ label: 'Football Item' }, { label: 'Football Item' }, { label: 'Football Item' }]
+                }
+            ],
+            [
+                {
+                    label: 'Tennis',
+                    items: [{ label: 'Tennis Item' }, { label: 'Tennis Item' }]
+                }
+            ]
+        ]
+    }
+]);
+const panelMenuitems = ref([
+    {
+        label: 'Customers',
+        icon: 'pi pi-fw pi-table',
+        items: [
+            {
+                label: 'New',
+                icon: 'pi pi-fw pi-user-plus',
+                items: [
+                    {
+                        label: 'Customer',
+                        icon: 'pi pi-fw pi-plus'
+                    },
+                    {
+                        label: 'Duplicate',
+                        icon: 'pi pi-fw pi-copy'
+                    }
+                ]
+            },
+            {
+                label: 'Edit',
+                icon: 'pi pi-fw pi-user-edit'
+            }
+        ]
+    },
+    {
+        label: 'Orders',
+        icon: 'pi pi-fw pi-shopping-cart',
+        items: [
+            {
+                label: 'View',
+                icon: 'pi pi-fw pi-list'
+            },
+            {
+                label: 'Search',
+                icon: 'pi pi-fw pi-search'
+            }
+        ]
+    },
+    {
+        label: 'Shipments',
+        icon: 'pi pi-fw pi-envelope',
+        items: [
+            {
+                label: 'Tracker',
+                icon: 'pi pi-fw pi-compass'
+            },
+            {
+                label: 'Map',
+                icon: 'pi pi-fw pi-map-marker'
+            },
+            {
+                label: 'Manage',
+                icon: 'pi pi-fw pi-pencil'
+            }
+        ]
+    },
+    {
+        label: 'Profile',
+        icon: 'pi pi-fw pi-user',
+        items: [
+            {
+                label: 'Settings',
+                icon: 'pi pi-fw pi-cog'
+            },
+            {
+                label: 'Billing',
+                icon: 'pi pi-fw pi-file'
+            }
+        ]
+    }
+]);
 
-							},
-							{
-								label:'Map',
-								icon:'pi pi-fw pi-map-marker'
+const toggleMenu = (event) => {
+    menu.value.toggle(event);
+};
 
-							},
-							{
-								label:'Manage',
-								icon:'pi pi-fw pi-pencil'
-							}
-						]
-					},
-					{
-						label:'Profile',
-						icon:'pi pi-fw pi-user',
-						items:[
-							{
-								label:'Settings',
-								icon:'pi pi-fw pi-cog'
-							},
-							{
-								label:'Billing',
-								icon:'pi pi-fw pi-file'
-							}
-						]
-					},
-					{
-						label:'Quit',
-						icon:'pi pi-fw pi-sign-out'
-					}
-				],
-				breadcrumbHome: {icon: 'pi pi-home', to: '/'},
-				breadcrumbItems: [
-					{label:'Computer'},
-					{label:'Notebook'},
-					{label:'Accessories'},
-					{label:'Backpacks'},
-					{label:'Item'}
-				],
-				nestedRouteItems: [
-					{
-						label: 'Personal',
-						to: '/menu'
-					},
-					{
-						label: 'Seat',
-						to: '/menu/seat'
-					},
-					{
-						label: 'Payment',
-						to: '/menu/payment'
-					},
-					{
-						label: 'Confirmation',
-						to: '/menu/confirmation'
-					}
-				],
-				tieredMenuItems: [
-					{
-						label:'Customers',
-						icon:'pi pi-fw pi-table',
-						items:[
-							{
-								label:'New',
-								icon:'pi pi-fw pi-user-plus',
-								items:[
-									{
-										label:'Customer',
-										icon:'pi pi-fw pi-plus'
-									},
-									{
-										label:'Duplicate',
-										icon:'pi pi-fw pi-copy'
-									},
-
-								]
-							},
-							{
-								label:'Edit',
-								icon:'pi pi-fw pi-user-edit'
-							}
-						]
-					},
-					{
-						label:'Orders',
-						icon:'pi pi-fw pi-shopping-cart',
-						items:[
-							{
-								label:'View',
-								icon:'pi pi-fw pi-list'
-							},
-							{
-								label:'Search',
-								icon:'pi pi-fw pi-search'
-							},
-
-						]
-					},
-					{
-						label:'Shipments',
-						icon:'pi pi-fw pi-envelope',
-						items:[
-							{
-								label:'Tracker',
-								icon:'pi pi-fw pi-compass'
-
-							},
-							{
-								label:'Map',
-								icon:'pi pi-fw pi-map-marker'
-
-							},
-							{
-								label:'Manage',
-								icon:'pi pi-fw pi-pencil'
-							}
-						]
-					},
-					{
-						label:'Profile',
-						icon:'pi pi-fw pi-user',
-						items:[
-							{
-								label:'Settings',
-								icon:'pi pi-fw pi-cog'
-							},
-							{
-								label:'Billing',
-								icon:'pi pi-fw pi-file'
-							}
-						]
-					},
-					{
-						separator:true
-					},
-					{
-						label:'Quit',
-						icon:'pi pi-fw pi-sign-out'
-					}
-				],
-				overlayMenuItems: [
-					{
-						label: 'Save',
-						icon: 'pi pi-save'
-					},
-					{
-						label: 'Update',
-						icon: 'pi pi-refresh'
-					},
-					{
-						label: 'Delete',
-						icon: 'pi pi-trash'
-					},
-					{
-						separator: true
-					},
-					{
-						label: 'Home',
-						icon: 'pi pi-home'
-					},
-				],
-				menuitems: [
-					{
-						label:'Customers',
-						items:[
-							{
-								label:'New',
-								icon:'pi pi-fw pi-plus',
-							},
-							{
-								label:'Edit',
-								icon:'pi pi-fw pi-user-edit'
-							}
-						]
-					},
-					{
-						label:'Orders',
-						items:[
-							{
-								label:'View',
-								icon:'pi pi-fw pi-list'
-							},
-							{
-								label:'Search',
-								icon:'pi pi-fw pi-search'
-							},
-
-						]
-					}
-				],
-				contextMenuItems: [
-					{
-						label: 'Save',
-						icon: 'pi pi-save'
-					},
-					{
-						label: 'Update',
-						icon: 'pi pi-refresh'
-					},
-					{
-						label: 'Delete',
-						icon: 'pi pi-trash'
-					},
-					{
-						separator: true
-					},
-					{
-						label: 'Options',
-						icon: 'pi pi-cog'
-					},
-				],
-				megamenuItems: [
-					{
-						label: 'Fashion', icon: 'pi pi-fw pi-tag',
-						items: [
-							[
-								{
-									label: 'Woman',
-									items: [{label: 'Woman Item'}, {label: 'Woman Item'}, {label: 'Woman Item'}]
-								},
-								{
-									label: 'Men',
-									items: [{label: 'Men Item'}, {label: 'Men Item'}, {label: 'Men Item'}]
-								}
-							],
-							[
-								{
-									label: 'Kids',
-									items: [{label: 'Kids Item'}, {label: 'Kids Item'} ]
-								},
-								{
-									label: 'Luggage',
-									items: [{label: 'Luggage Item'}, {label: 'Luggage Item'}, {label: 'Luggage Item'} ]
-								}
-							]
-						]
-					},
-					{
-						label: 'Electronics', icon: 'pi pi-fw pi-desktop',
-						items: [
-							[
-								{
-									label: 'Computer',
-									items: [{label: 'Computer Item'}, {label: 'Computer Item'}]
-								},
-								{
-									label: 'Camcorder',
-									items: [{label: 'Camcorder Item'}, {label: 'Camcorder Item'}, {label: 'Camcorder Item'}, ]
-								},
-							],
-							[
-								{
-									label: 'TV',
-									items: [{label: 'TV Item'}, {label: 'TV Item'}]
-								},
-								{
-									label: 'Audio',
-									items: [{label: 'Audio Item'}, {label: 'Audio Item'}, {label: 'Audio Item'} ]
-								}
-							],
-							[
-								{
-									label: 'Sports.7',
-									items: [{label: 'Sports.7.1'}, {label: 'Sports.7.2'}]
-								}
-							]
-						]
-					},
-					{
-						label: 'Furniture', icon: 'pi pi-fw pi-image',
-						items: [
-							[
-								{
-									label: 'Living Room',
-									items: [{label: 'Living Room Item'}, {label: 'Living Room Item'}, ]
-								},
-								{
-									label: 'Kitchen',
-									items: [{label: 'Kitchen Item'}, {label: 'Kitchen Item'}, {label: 'Kitchen Item'} ]
-								}
-							],
-							[
-								{
-									label: 'Bedroom',
-									items: [{label: 'Bedroom Item'}, {label: 'Bedroom Item'}]
-								},
-								{
-									label: 'Outdoor',
-									items: [{label: 'Outdoor Item'}, {label: 'Outdoor Item'}, {label: 'Outdoor Item'} ]
-								}
-							]
-						]
-					},
-					{
-						label: 'Sports', icon: 'pi pi-fw pi-star',
-						items: [
-							[
-								{
-									label: 'Basketball',
-									items: [{label: 'Basketball Item'}, {label: 'Basketball Item'}]
-								},
-								{
-									label: 'Football',
-									items: [{label: 'Football Item'}, {label: 'Football Item'}, {label: 'Football Item'}]
-								}
-							],
-							[
-								{
-									label: 'Tennis',
-									items: [{label: 'Tennis Item'}, {label: 'Tennis Item'}]
-								}
-							]
-						]
-					}
-				],
-				panelMenuitems: [
-					{
-						label:'Customers',
-						icon:'pi pi-fw pi-table',
-						items:[
-							{
-								label:'New',
-								icon:'pi pi-fw pi-user-plus',
-								items:[
-									{
-										label:'Customer',
-										icon:'pi pi-fw pi-plus'
-									},
-									{
-										label:'Duplicate',
-										icon:'pi pi-fw pi-copy'
-									},
-
-								]
-							},
-							{
-								label:'Edit',
-								icon:'pi pi-fw pi-user-edit'
-							}
-						]
-					},
-					{
-						label:'Orders',
-						icon:'pi pi-fw pi-shopping-cart',
-						items:[
-							{
-								label:'View',
-								icon:'pi pi-fw pi-list'
-							},
-							{
-								label:'Search',
-								icon:'pi pi-fw pi-search'
-							},
-
-						]
-					},
-					{
-						label:'Shipments',
-						icon:'pi pi-fw pi-envelope',
-						items:[
-							{
-								label:'Tracker',
-								icon:'pi pi-fw pi-compass'
-
-							},
-							{
-								label:'Map',
-								icon:'pi pi-fw pi-map-marker'
-
-							},
-							{
-								label:'Manage',
-								icon:'pi pi-fw pi-pencil'
-							}
-						]
-					},
-					{
-						label:'Profile',
-						icon:'pi pi-fw pi-user',
-						items:[
-							{
-								label:'Settings',
-								icon:'pi pi-fw pi-cog'
-							},
-							{
-								label:'Billing',
-								icon:'pi pi-fw pi-file'
-							}
-						]
-					}
-				],
-			}
-		},
-		methods: {
-			toggleMenu(event) {
-				this.$refs.menu.toggle(event);
-			},
-			onContextRightClick(event) {
-				this.$refs.contextMenu.show(event);
-			}
-		}
-	}
-</script>
\ No newline at end of file
+const onContextRightClick = (event) => {
+    contextMenu.value.show(event);
+};
+</script>
diff --git a/src/views/demo/Messages.vue b/src/views/demo/Messages.vue
index f51f5b8..166ca79 100644
--- a/src/views/demo/Messages.vue
+++ b/src/views/demo/Messages.vue
@@ -1,101 +1,99 @@
 <template>
-	<div class="grid">
-		<div class="col-12 lg:col-6">
-			<div class="card">
-				<h5>Toast</h5>
+    <div class="grid">
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h5>Toast</h5>
 
-				<Toast />
-				<Button @click="showSuccess()" label="Success" class="p-button-success mr-2" />
-				<Button @click="showInfo()" label="Info" class="p-button-info mr-2" />
-				<Button @click="showWarn()" label="Warn" class="p-button-warning mr-2" />
-				<Button @click="showError()" label="Error" class="p-button-danger mr-2" />
-			</div>
-		</div>
+                <Toast />
+                <Button @click="showSuccess()" label="Success" class="p-button-success mr-2" />
+                <Button @click="showInfo()" label="Info" class="p-button-info mr-2" />
+                <Button @click="showWarn()" label="Warn" class="p-button-warning mr-2" />
+                <Button @click="showError()" label="Error" class="p-button-danger mr-2" />
+            </div>
+        </div>
 
-		<div class="col-12 lg:col-6">
-			<div class="card">
-				<h5>Messages</h5>
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h5>Messages</h5>
 
-				<Button label="Success" @click="addMessage('success')" class="p-button-success mr-2"/>
-				<Button label="Info" @click="addMessage('info')" class="p-button-info mr-2"/>
-				<Button label="Warn" @click="addMessage('warn')" class="p-button-warning mr-2"/>
-				<Button label="Error" @click="addMessage('error')" class="p-button-danger mr-2"/>
+                <Button label="Success" @click="addMessage('success')" class="p-button-success mr-2" />
+                <Button label="Info" @click="addMessage('info')" class="p-button-info mr-2" />
+                <Button label="Warn" @click="addMessage('warn')" class="p-button-warning mr-2" />
+                <Button label="Error" @click="addMessage('error')" class="p-button-danger mr-2" />
 
-				<transition-group name="p-message" tag="div">
-					<Message v-for="msg of message" :severity="msg.severity" :key="msg.content">{{msg.content}}</Message>
-				</transition-group>
-			</div>
-		</div>
+                <transition-group name="p-message" tag="div">
+                    <Message v-for="msg of message" :severity="msg.severity" :key="msg.content">{{ msg.content }}</Message>
+                </transition-group>
+            </div>
+        </div>
 
-		<div class="col-12 lg:col-8">
-			<div class="card">
-				<h5>Inline</h5>
-				<div class="field grid">
-					<label for="username1" class="col-fixed w-9rem">Username</label>
-					<div class="col">
-						<InputText id="username1" v-model="username" :required="true" class="p-invalid mr-2"></InputText>
-						<InlineMessage>Username is required</InlineMessage>
-					</div>
-				</div>
-				<div class="field grid">
-					<label for="email" class="col-fixed w-9rem">Email</label>
-					<div class="col">
-						<InputText id="email" v-model="email" :required="true" class="p-invalid mr-2"></InputText>
-						<InlineMessage/>
-					</div>
-				</div>
-			</div>
-		</div>
+        <div class="col-12 lg:col-8">
+            <div class="card">
+                <h5>Inline</h5>
+                <div class="field grid">
+                    <label for="username1" class="col-fixed w-9rem">Username</label>
+                    <div class="col">
+                        <InputText id="username1" v-model="username" :required="true" class="p-invalid mr-2"></InputText>
+                        <InlineMessage>Username is required</InlineMessage>
+                    </div>
+                </div>
+                <div class="field grid">
+                    <label for="email" class="col-fixed w-9rem">Email</label>
+                    <div class="col">
+                        <InputText id="email" v-model="email" :required="true" class="p-invalid mr-2"></InputText>
+                        <InlineMessage />
+                    </div>
+                </div>
+            </div>
+        </div>
 
-		<div class="col-12 lg:col-4">
-			<div class="card">
-				<h5>Help Text</h5>
-				<div class="field p-fluid">
-					<label for="username2">Username</label>
-					<InputText id="username2" type="username" class="p-error" aria-describedby="username-help" />
-					<small id="username-help" class="p-error">Enter your username to reset your password.</small>
-				</div>
-			</div>
-		</div>
-	</div>
+        <div class="col-12 lg:col-4">
+            <div class="card">
+                <h5>Help Text</h5>
+                <div class="field p-fluid">
+                    <label for="username2">Username</label>
+                    <InputText id="username2" type="username" class="p-error" aria-describedby="username-help" />
+                    <small id="username-help" class="p-error">Enter your username to reset your password.</small>
+                </div>
+            </div>
+        </div>
+    </div>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				message: [],
-				username:null,
-				email:null
-			}
-		},
-		methods: {
-			addMessage(type) {
-				if(type === 'success') {
-					this.message = [{severity: 'success', detail: 'Success Message', content: 'Message sent', id: this.count++}]
-				}
-				else if(type === 'info') {
-					this.message = [{severity: 'info', detail: 'Info Message', content: 'PrimeVue rocks', id: this.count++}]
-				}
-				else if(type === 'warn') {
-					this.message = [{severity: 'warn', detail: 'Warn Message', content: 'There are unsaved changes', id: this.count++}]
-				}
-				else if(type === 'error') {
-					this.message = [{severity: 'error', detail: 'Error Message', content: 'Validation failed', id: this.count++}]
-				}
-			},
-			showSuccess() {
-				this.$toast.add({severity:'success', summary: 'Success Message', detail:'Message Detail', life: 3000});
-			},
-			showInfo() {
-				this.$toast.add({severity:'info', summary: 'Info Message', detail:'Message Detail', life: 3000});
-			},
-			showWarn() {
-				this.$toast.add({severity:'warn', summary: 'Warn Message', detail:'Message Detail', life: 3000});
-			},
-			showError() {
-				this.$toast.add({severity:'error', summary: 'Error Message', detail:'Message Detail', life: 3000});
-			},
-		}
-	}
+<script setup>
+import { ref } from 'vue';
+import { useToast } from 'primevue/usetoast';
+
+const toast = useToast();
+const message = ref([]);
+const username = ref(null);
+const email = ref(null);
+
+const addMessage = (type) => {
+    if (type === 'success') {
+        this.message = [{ severity: 'success', detail: 'Success Message', content: 'Message sent', id: this.count++ }];
+    } else if (type === 'info') {
+        this.message = [{ severity: 'info', detail: 'Info Message', content: 'PrimeVue rocks', id: this.count++ }];
+    } else if (type === 'warn') {
+        this.message = [{ severity: 'warn', detail: 'Warn Message', content: 'There are unsaved changes', id: this.count++ }];
+    } else if (type === 'error') {
+        this.message = [{ severity: 'error', detail: 'Error Message', content: 'Validation failed', id: this.count++ }];
+    }
+};
+
+const showSuccess = () => {
+    toast.add({ severity: 'success', summary: 'Success Message', detail: 'Message Detail', life: 3000 });
+};
+
+const showInfo = () => {
+    toast.add({ severity: 'info', summary: 'Info Message', detail: 'Message Detail', life: 3000 });
+};
+
+const showWarn = () => {
+    toast.add({ severity: 'warn', summary: 'Warn Message', detail: 'Message Detail', life: 3000 });
+};
+
+const showError = () => {
+    toast.add({ severity: 'error', summary: 'Error Message', detail: 'Message Detail', life: 3000 });
+};
 </script>
diff --git a/src/views/demo/Misc.vue b/src/views/demo/Misc.vue
index df4df11..dfc4247 100644
--- a/src/views/demo/Misc.vue
+++ b/src/views/demo/Misc.vue
@@ -1,191 +1,180 @@
 <template>
-	<div class="grid">
-    <div class="col-12">
-        <div class="card">
-            <h5>ProgressBar</h5>
-            <div class="grid">
-                <div class="col">
-                    <ProgressBar :value="value"></ProgressBar>
-                </div>
-                <div class="col">
-                    <ProgressBar :value="50" :showValue="false"></ProgressBar>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-12 lg:col-6">
-        <div class="card">
-            <h4>Badge</h4>
-            <h5>Numbers</h5>
-            <div class="badges">
-                <Badge :value="2" class="mr-2"></Badge>
-                <Badge :value="8" severity="success" class="mr-2"></Badge>
-                <Badge :value="4" severity="info" class="mr-2"></Badge>
-                <Badge :value="12" severity="warning" class="mr-2"></Badge>
-                <Badge :value="3" severity="danger"></Badge>
-            </div>
-
-            <h5>Positioned Badge</h5>
-            <i class="pi pi-bell mr-4 p-text-secondary" style="font-size: 2rem" v-badge="2"></i>
-            <i class="pi pi-calendar mr-4 p-text-secondary" style="font-size: 2rem" v-badge.danger="'10+'"></i>
-            <i class="pi pi-envelope p-text-secondary" style="font-size: 2rem" v-badge.danger></i>
-
-
-            <h5>Inline Button Badge</h5>
-            <Button label="Emails" badge="8" class="mr-2"></Button>
-            <Button label="Messages" icon="pi pi-users" class="p-button-warning" badge="8" badgeClass="p-badge-danger"></Button>
-
-            <h5>Sizes</h5>
-            <div class="badges">
-                <Badge :value="2" class="mr-2"></Badge>
-                <Badge :value="4" size="large" severity="warning" class="mr-2"></Badge>
-                <Badge :value="6" size="xlarge" severity="success"></Badge>
-            </div>
-        </div>
-
-        <div class="card">
-            <h4>Avatar</h4>
-            <h5>Avatar Group</h5>
-            <AvatarGroup class="mb-3">
-                <Avatar image="images/avatar/amyelsner.png" size="large" shape="circle"></Avatar>
-                <Avatar image="images/avatar/asiyajavayant.png" size="large" shape="circle"></Avatar>
-                <Avatar image="images/avatar/onyamalimba.png" size="large" shape="circle"></Avatar>
-                <Avatar image="images/avatar/ionibowcher.png" size="large" shape="circle"></Avatar>
-                <Avatar image="images/avatar/xuxuefeng.png" size="large" shape="circle"></Avatar>
-                <Avatar label="+2" shape="circle" size="large" :style="{'background-color':'#9c27b0', 'color': '#ffffff'}"></Avatar>
-            </AvatarGroup>
-
-            <h5>Label - Circle</h5>
-            <Avatar label="P" class="mr-2" size="xlarge" shape="circle"></Avatar>
-            <Avatar label="V" class="mr-2" size="large" :style="{'background-color':'#2196F3', 'color': '#ffffff'}" shape="circle"></Avatar>
-            <Avatar label="U" class="mr-2" :style="{'background-color': '#9c27b0', 'color': '#ffffff'}" shape="circle"></Avatar>
-
-            <h5>Icon - Badge</h5>
-            <Avatar icon="pi pi-user" class="mr-2" size="xlarge" v-badge.success="4"></Avatar>
-        </div>
-
-        <div class="card">
-            <h4>ScrollTop</h4>
-            <ScrollPanel :style="{width: '250px', height: '200px'}">
-                <p>
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-                    Vitae et leo duis ut diam.
-                    Ultricies mi quis hendrerit dolor magna eget est lorem. Amet consectetur adipiscing elit ut.
-                    Nam libero justo laoreet sit amet. Pharetra massa massa ultricies mi quis hendrerit dolor magna.
-                    Est ultricies integer quis auctor elit sed vulputate. Consequat ac felis donec et. Tellus orci ac auctor augue mauris.
-                    Semper feugiat nibh sed pulvinar proin gravida hendrerit lectus a. Tincidunt arcu non sodales neque sodales.
-                    Metus aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices. Sodales ut etiam sit amet nisl purus.
-                    Cursus sit amet dictum sit amet. Tristique senectus et netus et malesuada fames ac turpis egestas.
-                    Et tortor consequat id porta nibh venenatis cras sed. Diam maecenas ultricies mi eget mauris.
-                    Eget egestas purus viverra accumsan in nisl nisi. Suscipit adipiscing bibendum est ultricies integer.
-                    Mattis aliquam faucibus purus in massa tempor nec.
-                </p>
-                <ScrollTop target="parent" :threshold="100" icon="pi pi-arrow-up"></ScrollTop>
-            </ScrollPanel>
-        </div>
-    </div>
-    <div class="col-12 lg:col-6">
-        <div class="card">
-            <h4>Tag</h4>
-            <h5>Tags</h5>
-            <Tag class="mr-2" value="Primary"></Tag>
-            <Tag class="mr-2" severity="success" value="Success"></Tag>
-            <Tag class="mr-2" severity="info" value="Info"></Tag>
-            <Tag class="mr-2" severity="warning" value="Warning"></Tag>
-            <Tag severity="danger" value="Danger"></Tag>
-
-            <h5>Pills</h5>
-            <Tag class="mr-2" value="Primary" :rounded="true"></Tag>
-            <Tag class="mr-2" severity="success" value="Success" :rounded="true"></Tag>
-            <Tag class="mr-2" severity="info" value="Info" :rounded="true"></Tag>
-            <Tag class="mr-2" severity="warning" value="Warning" :rounded="true"></Tag>
-            <Tag severity="danger" value="Danger" :rounded="true"></Tag>
-
-            <h5>Icons</h5>
-            <Tag class="mr-2" icon="pi pi-user" value="Primary"></Tag>
-            <Tag class="mr-2" icon="pi pi-check" severity="success" value="Success"></Tag>
-            <Tag class="mr-2" icon="pi pi-info-circle" severity="info" value="Info"></Tag>
-            <Tag class="mr-2" con="pi pi-exclamation-triangle" severity="warning" value="Warning"></Tag>
-            <Tag icon="pi pi-times" severity="danger" value="Danger"></Tag>
-        </div>
-
-        <div class="card">
-            <h4>Chip</h4>
-            <h5>Basic</h5>
-            <div class="flex align-items-center flex-column sm:flex-row">
-                <Chip label="Action" class="mr-2 mb-2"></Chip>
-                <Chip label="Comedy" class="mr-2 mb-2"></Chip>
-                <Chip label="Mystery" class="mr-2 mb-2"></Chip>
-                <Chip label="Thriller" :removable="true" class="mb-2"></Chip>
-            </div>
-
-            <h5>Icon</h5>
-            <div class="flex align-items-center flex-column sm:flex-row">
-                <Chip label="Apple" icon="pi pi-apple" class="mr-2 mb-2"></Chip>
-                <Chip label="Facebook" icon="pi pi-facebook" class="mr-2 mb-2"></Chip>
-                <Chip label="Google" icon="pi pi-google" class="mr-2 mb-2"></Chip>
-                <Chip label="Microsoft" icon="pi pi-microsoft" :removable="true" class="mb-2"></Chip>
-            </div>
-
-            <h5>Image</h5>
-            <div class="flex align-items-center flex-column sm:flex-row">
-                <Chip label="Amy Elsner" image="images/avatar/amyelsner.png" class="mr-2 mb-2"></Chip>
-                <Chip label="Asiya Javayant" image="images/avatar/asiyajavayant.png" class="mr-2 mb-2"></Chip>
-                <Chip label="Onyama Limba" image="images/avatar/onyamalimba.png" class="mr-2 mb-2"></Chip>
-            </div>
-        </div>
-
-        <div class="card">
-            <h4>Skeleton</h4>
-            <div class="border-round border-1 surface-border p-4">
-                <div class="flex mb-3">
-                    <Skeleton shape="circle" size="4rem" class="mr-2"></Skeleton>
-                    <div>
-                        <Skeleton width="10rem" class="mb-2"></Skeleton>
-                        <Skeleton width="5rem" class="mb-2"></Skeleton>
-                        <Skeleton height=".5rem"></Skeleton>
+    <div class="grid">
+        <div class="col-12">
+            <div class="card">
+                <h5>ProgressBar</h5>
+                <div class="grid">
+                    <div class="col">
+                        <ProgressBar :value="value"></ProgressBar>
+                    </div>
+                    <div class="col">
+                        <ProgressBar :value="50" :showValue="false"></ProgressBar>
                     </div>
                 </div>
-                <Skeleton width="100%" height="150px"></Skeleton>
-                <div class="flex justify-content-between mt-3">
-                    <Skeleton width="4rem" height="2rem"></Skeleton>
-                    <Skeleton width="4rem" height="2rem"></Skeleton>
+            </div>
+        </div>
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h4>Badge</h4>
+                <h5>Numbers</h5>
+                <div class="badges">
+                    <Badge :value="2" class="mr-2"></Badge>
+                    <Badge :value="8" severity="success" class="mr-2"></Badge>
+                    <Badge :value="4" severity="info" class="mr-2"></Badge>
+                    <Badge :value="12" severity="warning" class="mr-2"></Badge>
+                    <Badge :value="3" severity="danger"></Badge>
+                </div>
+
+                <h5>Positioned Badge</h5>
+                <i class="pi pi-bell mr-4 p-text-secondary" style="font-size: 2rem" v-badge="2"></i>
+                <i class="pi pi-calendar mr-4 p-text-secondary" style="font-size: 2rem" v-badge.danger="'10+'"></i>
+                <i class="pi pi-envelope p-text-secondary" style="font-size: 2rem" v-badge.danger></i>
+
+                <h5>Inline Button Badge</h5>
+                <Button label="Emails" badge="8" class="mr-2"></Button>
+                <Button label="Messages" icon="pi pi-users" class="p-button-warning" badge="8" badgeClass="p-badge-danger"></Button>
+
+                <h5>Sizes</h5>
+                <div class="badges">
+                    <Badge :value="2" class="mr-2"></Badge>
+                    <Badge :value="4" size="large" severity="warning" class="mr-2"></Badge>
+                    <Badge :value="6" size="xlarge" severity="success"></Badge>
+                </div>
+            </div>
+
+            <div class="card">
+                <h4>Avatar</h4>
+                <h5>Avatar Group</h5>
+                <AvatarGroup class="mb-3">
+                    <Avatar image="images/avatar/amyelsner.png" size="large" shape="circle"></Avatar>
+                    <Avatar image="images/avatar/asiyajavayant.png" size="large" shape="circle"></Avatar>
+                    <Avatar image="images/avatar/onyamalimba.png" size="large" shape="circle"></Avatar>
+                    <Avatar image="images/avatar/ionibowcher.png" size="large" shape="circle"></Avatar>
+                    <Avatar image="images/avatar/xuxuefeng.png" size="large" shape="circle"></Avatar>
+                    <Avatar label="+2" shape="circle" size="large" :style="{ 'background-color': '#9c27b0', color: '#ffffff' }"></Avatar>
+                </AvatarGroup>
+
+                <h5>Label - Circle</h5>
+                <Avatar label="P" class="mr-2" size="xlarge" shape="circle"></Avatar>
+                <Avatar label="V" class="mr-2" size="large" :style="{ 'background-color': '#2196F3', color: '#ffffff' }" shape="circle"></Avatar>
+                <Avatar label="U" class="mr-2" :style="{ 'background-color': '#9c27b0', color: '#ffffff' }" shape="circle"></Avatar>
+
+                <h5>Icon - Badge</h5>
+                <Avatar icon="pi pi-user" class="mr-2" size="xlarge" v-badge.success="4"></Avatar>
+            </div>
+
+            <div class="card">
+                <h4>ScrollTop</h4>
+                <ScrollPanel :style="{ width: '250px', height: '200px' }">
+                    <p>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Vitae et leo duis ut diam. Ultricies mi quis hendrerit dolor magna eget est lorem. Amet consectetur
+                        adipiscing elit ut. Nam libero justo laoreet sit amet. Pharetra massa massa ultricies mi quis hendrerit dolor magna. Est ultricies integer quis auctor elit sed vulputate. Consequat ac felis donec et. Tellus orci ac auctor
+                        augue mauris. Semper feugiat nibh sed pulvinar proin gravida hendrerit lectus a. Tincidunt arcu non sodales neque sodales. Metus aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices. Sodales ut etiam sit amet
+                        nisl purus. Cursus sit amet dictum sit amet. Tristique senectus et netus et malesuada fames ac turpis egestas. Et tortor consequat id porta nibh venenatis cras sed. Diam maecenas ultricies mi eget mauris. Eget egestas purus
+                        viverra accumsan in nisl nisi. Suscipit adipiscing bibendum est ultricies integer. Mattis aliquam faucibus purus in massa tempor nec.
+                    </p>
+                    <ScrollTop target="parent" :threshold="100" icon="pi pi-arrow-up"></ScrollTop>
+                </ScrollPanel>
+            </div>
+        </div>
+        <div class="col-12 lg:col-6">
+            <div class="card">
+                <h4>Tag</h4>
+                <h5>Tags</h5>
+                <Tag class="mr-2" value="Primary"></Tag>
+                <Tag class="mr-2" severity="success" value="Success"></Tag>
+                <Tag class="mr-2" severity="info" value="Info"></Tag>
+                <Tag class="mr-2" severity="warning" value="Warning"></Tag>
+                <Tag severity="danger" value="Danger"></Tag>
+
+                <h5>Pills</h5>
+                <Tag class="mr-2" value="Primary" :rounded="true"></Tag>
+                <Tag class="mr-2" severity="success" value="Success" :rounded="true"></Tag>
+                <Tag class="mr-2" severity="info" value="Info" :rounded="true"></Tag>
+                <Tag class="mr-2" severity="warning" value="Warning" :rounded="true"></Tag>
+                <Tag severity="danger" value="Danger" :rounded="true"></Tag>
+
+                <h5>Icons</h5>
+                <Tag class="mr-2" icon="pi pi-user" value="Primary"></Tag>
+                <Tag class="mr-2" icon="pi pi-check" severity="success" value="Success"></Tag>
+                <Tag class="mr-2" icon="pi pi-info-circle" severity="info" value="Info"></Tag>
+                <Tag class="mr-2" con="pi pi-exclamation-triangle" severity="warning" value="Warning"></Tag>
+                <Tag icon="pi pi-times" severity="danger" value="Danger"></Tag>
+            </div>
+
+            <div class="card">
+                <h4>Chip</h4>
+                <h5>Basic</h5>
+                <div class="flex align-items-center flex-column sm:flex-row">
+                    <Chip label="Action" class="mr-2 mb-2"></Chip>
+                    <Chip label="Comedy" class="mr-2 mb-2"></Chip>
+                    <Chip label="Mystery" class="mr-2 mb-2"></Chip>
+                    <Chip label="Thriller" :removable="true" class="mb-2"></Chip>
+                </div>
+
+                <h5>Icon</h5>
+                <div class="flex align-items-center flex-column sm:flex-row">
+                    <Chip label="Apple" icon="pi pi-apple" class="mr-2 mb-2"></Chip>
+                    <Chip label="Facebook" icon="pi pi-facebook" class="mr-2 mb-2"></Chip>
+                    <Chip label="Google" icon="pi pi-google" class="mr-2 mb-2"></Chip>
+                    <Chip label="Microsoft" icon="pi pi-microsoft" :removable="true" class="mb-2"></Chip>
+                </div>
+
+                <h5>Image</h5>
+                <div class="flex align-items-center flex-column sm:flex-row">
+                    <Chip label="Amy Elsner" image="images/avatar/amyelsner.png" class="mr-2 mb-2"></Chip>
+                    <Chip label="Asiya Javayant" image="images/avatar/asiyajavayant.png" class="mr-2 mb-2"></Chip>
+                    <Chip label="Onyama Limba" image="images/avatar/onyamalimba.png" class="mr-2 mb-2"></Chip>
+                </div>
+            </div>
+
+            <div class="card">
+                <h4>Skeleton</h4>
+                <div class="border-round border-1 surface-border p-4">
+                    <div class="flex mb-3">
+                        <Skeleton shape="circle" size="4rem" class="mr-2"></Skeleton>
+                        <div>
+                            <Skeleton width="10rem" class="mb-2"></Skeleton>
+                            <Skeleton width="5rem" class="mb-2"></Skeleton>
+                            <Skeleton height=".5rem"></Skeleton>
+                        </div>
+                    </div>
+                    <Skeleton width="100%" height="150px"></Skeleton>
+                    <div class="flex justify-content-between mt-3">
+                        <Skeleton width="4rem" height="2rem"></Skeleton>
+                        <Skeleton width="4rem" height="2rem"></Skeleton>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</div>
-
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				value: 0
-			}
-		},
-		interval: null,
-		methods: {
-			startProgress() {
-				this.interval = setInterval(() => {
-					let newValue = this.value + Math.floor(Math.random() * 10) + 1;
-					if (newValue >= 100) {
-						newValue = 100;
-					}
-					this.value = newValue;
-				}, 2000);
-			},
-			endProgress() {
-				clearInterval(this.interval);
-				this.interval = null;
-			}
-		},
-		mounted() {
-			this.startProgress();
-		},
-		beforeUnmount() {
-			this.endProgress();
-		}
-	}
-</script>
\ No newline at end of file
+<script setup>
+import { ref, onMounted, onBeforeUnmount } from 'vue';
+
+const value = ref(0);
+let interval = null;
+
+const startProgress = () => {
+    interval = setInterval(() => {
+        let newValue = value.value + Math.floor(Math.random() * 10) + 1;
+        if (newValue >= 100) {
+            newValue = 100;
+        }
+        value.value = newValue;
+    }, 2000);
+};
+const endProgress = () => {
+    clearInterval(interval);
+    interval = null;
+};
+
+onMounted(() => {
+    startProgress();
+});
+
+onBeforeUnmount(() => {
+    endProgress();
+});
+</script>