diff --git a/resources/art/stock_images/announcement/Elegant 1.png b/resources/art/stock_images/announcement/Elegant 1.png
new file mode 100644
index 000000000..14d0ee693
Binary files /dev/null and b/resources/art/stock_images/announcement/Elegant 1.png differ
diff --git a/resources/art/stock_images/announcement/Elegant 2.png b/resources/art/stock_images/announcement/Elegant 2.png
new file mode 100644
index 000000000..03ffa3b67
Binary files /dev/null and b/resources/art/stock_images/announcement/Elegant 2.png differ
diff --git a/resources/art/stock_images/announcement/Fun 1.png b/resources/art/stock_images/announcement/Fun 1.png
new file mode 100644
index 000000000..2d38acc4c
Binary files /dev/null and b/resources/art/stock_images/announcement/Fun 1.png differ
diff --git a/resources/art/stock_images/announcement/Fun 2.png b/resources/art/stock_images/announcement/Fun 2.png
new file mode 100644
index 000000000..7b16274e7
Binary files /dev/null and b/resources/art/stock_images/announcement/Fun 2.png differ
diff --git a/resources/art/stock_images/announcement/Majestic 1.png b/resources/art/stock_images/announcement/Majestic 1.png
new file mode 100644
index 000000000..8a5f345d0
Binary files /dev/null and b/resources/art/stock_images/announcement/Majestic 1.png differ
diff --git a/resources/art/stock_images/announcement/Majestic 2.png b/resources/art/stock_images/announcement/Majestic 2.png
new file mode 100644
index 000000000..79b3f76ff
Binary files /dev/null and b/resources/art/stock_images/announcement/Majestic 2.png differ
diff --git a/resources/art/stock_images/announcement/Majestic 3.png b/resources/art/stock_images/announcement/Majestic 3.png
new file mode 100644
index 000000000..67de619be
Binary files /dev/null and b/resources/art/stock_images/announcement/Majestic 3.png differ
diff --git a/resources/art/stock_images/announcement/Party 1.png b/resources/art/stock_images/announcement/Party 1.png
new file mode 100644
index 000000000..d7562337d
Binary files /dev/null and b/resources/art/stock_images/announcement/Party 1.png differ
diff --git a/resources/art/stock_images/announcement/Party 2.png b/resources/art/stock_images/announcement/Party 2.png
new file mode 100644
index 000000000..1c72a6e69
Binary files /dev/null and b/resources/art/stock_images/announcement/Party 2.png differ
diff --git a/resources/js/Components/CMS/Fields/SelectLayout.vue b/resources/js/Components/CMS/Fields/SelectLayout.vue
index 5c08ce9b1..cfe1c9a70 100644
--- a/resources/js/Components/CMS/Fields/SelectLayout.vue
+++ b/resources/js/Components/CMS/Fields/SelectLayout.vue
@@ -91,7 +91,7 @@ const onSubmitNote = async (layoutType: string) => {
 			</div>
 
 			<div class="flex justify-end gap-x-2 mt-3">
-				<Button label="Cancel" @click="() => (isModalOpen = false)" type="tertiary" />
+				<Button label="Cancel" @click="() => (isModalOpen = false)" :style="'tertiary'" />
 				<!-- <Button
           label="Submit"
           :disabled="!modelValue"
diff --git a/resources/js/Components/Elements/Buttons/Button.vue b/resources/js/Components/Elements/Buttons/Button.vue
index 09bf0a25f..ad931a51f 100644
--- a/resources/js/Components/Elements/Buttons/Button.vue
+++ b/resources/js/Components/Elements/Buttons/Button.vue
@@ -29,8 +29,6 @@ const props = withDefaults(defineProps<{
     tooltip?: string
     loading?:boolean
     disabled?: boolean
-    type?: string
-    buttonType?: 'button' | 'submit' | 'reset'
 }>(), {
     style: 'primary',
     size: 'm',
@@ -60,7 +58,7 @@ else if (props.style == 'secondary' || props.style == 'edit') {
         styleClass = 'border border-gray-300 text-gray-600 bg-gray-300 bg-gradient-to-r from-gray-100 to-gray-300 hover:bg-none'
     }
 } 
-else if (props.style == 'tertiary' || props.type == 'tertiary') styleClass = 'bg-transparent border border-gray-300 text-gray-700 hover:bg-gray-200/70 disabled:text-gray-400 disabled:bg-gray-200/90'
+else if (props.style == 'tertiary') styleClass = 'bg-transparent border border-gray-300 text-gray-700 hover:bg-gray-200/70 disabled:text-gray-400 disabled:bg-gray-200/90'
 else if (props.style == 'rainbow') styleClass = 'bg-indigo-500 bg-gradient-to-r from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 text-gray-100 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2'
 
 else if (props.style == 'delete' || props.style == 'negative' || props.style == 'cancel') styleClass = 'border border-red-400 text-red-500 hover:text-red-600 hover:bg-red-100 disabled:border-red-200 disabled:bg-red-100 disabled:text-red-300 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2'
@@ -152,7 +150,7 @@ const getActionIcon = (icon: any) => {
 
 <template>
     <button
-        :type="buttonType || 'button'"
+        type="button"
         class="leading-4 inline-flex items-center gap-x-2 font-medium shadow-sm focus:outline-none tabular-nums"
         :class="[
             // icon ? 'px-2 sm:px-4' : 'px-3 sm:px-5 ',
diff --git a/resources/js/Components/Utils/GalleryManagement/GalleryUpload.vue b/resources/js/Components/Utils/GalleryManagement/GalleryUpload.vue
index 241b6afcf..d5be498a3 100644
--- a/resources/js/Components/Utils/GalleryManagement/GalleryUpload.vue
+++ b/resources/js/Components/Utils/GalleryManagement/GalleryUpload.vue
@@ -59,7 +59,7 @@ const formatSize = (bytes: number) => {
         >
             <template #header="{ chooseCallback, uploadCallback, clearCallback, files }">
                 <div class="flex flex-wrap justify-center items-center flex-1 gap-4">
-                    <Button @click="chooseCallback()" label="Choose" icon="fal fa-images" type="tertiary" />
+                    <Button @click="chooseCallback()" label="Choose" icon="fal fa-images" :style="'tertiary'" />
                     <Button @click="emits('onSubmitUpload', files, clearCallback)" label="Upload" icon="fal fa-upload" :loading="isLoading" :disabled="!files || files.length === 0" />
                     <Button @click="clearCallback()" label="Clear" type="negative" :disabled="!files || files.length === 0" />
                 </div>
diff --git a/resources/js/Components/Utils/GalleryManagement/GalleryUploadedImages.vue b/resources/js/Components/Utils/GalleryManagement/GalleryUploadedImages.vue
index 6d25988ac..9c159ab21 100644
--- a/resources/js/Components/Utils/GalleryManagement/GalleryUploadedImages.vue
+++ b/resources/js/Components/Utils/GalleryManagement/GalleryUploadedImages.vue
@@ -223,7 +223,7 @@ onUnmounted(() => {
                     </div>
             
                     <div v-if="optionsLinks?.next" class="mt-8 flex justify-center">
-                        <Button @click="onFetchNext" :label="trans('Load more')" :loading="!!isLoading" type="tertiary" />
+                        <Button @click="onFetchNext" :label="trans('Load more')" :loading="!!isLoading" :style="'tertiary'" />
                     </div>
                 </template>
 
diff --git a/resources/js/Pages/Public/Auth/Login.vue b/resources/js/Pages/Public/Auth/Login.vue
index ad90d7805..c6637f7fe 100644
--- a/resources/js/Pages/Public/Auth/Login.vue
+++ b/resources/js/Pages/Public/Auth/Login.vue
@@ -114,7 +114,7 @@ const condition: Ref<string | boolean> = ref(false)
                 </div>
 
                 <Button
-                    buttonType="submit"
+                    type="submit"
                     id="submit"
                     :loading="isLoading"
                     full