diff --git a/cms/src/lib/data/qualify-exam.json b/cms/src/lib/data/qualify-exam.json
index b1ecc73..5f17601 100644
--- a/cms/src/lib/data/qualify-exam.json
+++ b/cms/src/lib/data/qualify-exam.json
@@ -4,12 +4,12 @@
         "category":"สำนักงาน ก.ก.","category_id":"1",
         "detail":"<p></p><br/><center><h2>ด่วน !! สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร ประกาศกำหนดวัน เวลา สถานที่คัดเลือก และระเบียบ เกี่ยวกับการคัดเลือกบุคลากรกรุงเทพมหานครหรือผู้ปฏิบัติงานอื่นในกรุงเทพมหานครเพื่อบรรจุและแต่งตั้ง เป็นข้าราชการกรุงเทพมหานครสามัญ ครั้งที่ 1 / 2565</h2></center>",
         "announcement_startDate": "2023-04-01",
-        "announcement_endDate": "2023-05-15",
+        "announcement_endDate": "2023-04-15",
         "announcementExam": true,
-        "register_startDate": "2023-04-01",
+        "register_startDate": "2023-04-03",
         "register_endDate": "2023-04-10",
-        "payment_startDate": "2023-04-5",
-        "payment_endDate": "2023-04-10",
+        "payment_startDate": "2023-04-7",
+        "payment_endDate": "2023-04-15",
         "examDate": "2023-04-28",
         "positions":[
             {"id":"2","title":"ผู้คุมงานทำความสะอาด","path":"2/21"}
diff --git a/cms/src/routes/competitive/+page.server.ts b/cms/src/routes/competitive/+page.server.ts
index 514348d..0cca374 100644
--- a/cms/src/routes/competitive/+page.server.ts
+++ b/cms/src/routes/competitive/+page.server.ts
@@ -1,7 +1,6 @@
 import { env } from '$env/dynamic/private'
 import { error } from '@sveltejs/kit';
 import type {CalendarEvent,Exam} from '$lib/data/CMSDataType'
-import {getBgColorDict} from '$lib/utils'
 import dayjs from 'dayjs'
 import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({fetch}) => {
@@ -9,12 +8,10 @@ export const load: PageServerLoad = async ({fetch}) => {
 	if(!res.ok)
         throw error(res.status, 'ไม่สามารถอ่านข้อมูลการสอบได้');
     const exams:Exam[] = await res.json()
-    const catColor = {};
     const events:CalendarEvent[]=[]
     
     exams.forEach((ex)=>{
-        const {id,title,category,announcement_startDate} = ex
-        const backgroundColor = category? getBgColorDict(category,catColor):"n/a"
+        const {id,title,announcement_startDate} = ex
         const url = "/qualifying/"+id
         ex.date = dayjs(announcement_startDate).format("DD MMM BBBB")
         ex.image = ex.image?ex.image:"/images/exam_place_holder.png"
@@ -24,16 +21,16 @@ export const load: PageServerLoad = async ({fetch}) => {
         if(ex.register_startDate){
             const start = ex.register_startDate
             const end = ex.register_endDate
-            events.push({id,"title":"สมัคร:"+title,start,end,url,backgroundColor})
+            events.push({id,"title":"สมัคร:"+title,start,end,url,backgroundColor:'#67a1ff4a'})
         }
         if(ex.payment_startDate){
             const start = ex.payment_startDate
             const end = ex.payment_endDate
-            events.push({id,"title":"ชำระเงิน:"+title,start,end,url,backgroundColor})
+            events.push({id,"title":"ชำระเงิน:"+title,start,end,url,backgroundColor:'#D2B4DE'})
         }
         if(ex.examDate){
             const start = ex.examDate 
-            events.push({id,"title":"วันสอบ:"+title,start,url,backgroundColor})
+            events.push({id,"title":"วันสอบ:"+title,start,url,backgroundColor:'#a2d9ce8f'})
         }
     })
     return {exams,events}
diff --git a/cms/src/routes/qualifying/+page.server.ts b/cms/src/routes/qualifying/+page.server.ts
index d413683..be10757 100644
--- a/cms/src/routes/qualifying/+page.server.ts
+++ b/cms/src/routes/qualifying/+page.server.ts
@@ -1,7 +1,6 @@
 import { env } from '$env/dynamic/private'
 import { error } from '@sveltejs/kit';
 import type {CalendarEvent,Exam} from '$lib/data/CMSDataType'
-import {getBgColorDict} from '$lib/utils'
 import dayjs from 'dayjs'
 import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({fetch}) => {
@@ -9,12 +8,10 @@ export const load: PageServerLoad = async ({fetch}) => {
 	if(!res.ok)
         throw error(res.status, 'ไม่สามารถอ่านข้อมูลการสอบได้');
     const exams:Exam[] = await res.json()
-    const catColor = {};
     const events:CalendarEvent[]=[]
     
     exams.forEach((ex)=>{
-        const {id,title,category,announcement_startDate} = ex
-        const backgroundColor = category? getBgColorDict(category,catColor):"n/a"
+        const {id,title,announcement_startDate} = ex
         const url = "/qualifying/"+id
         ex.date = dayjs(announcement_startDate).format("DD MMM BBBB")
         ex.image = ex.image?ex.image:"/images/exam_place_holder.png"
@@ -24,16 +21,16 @@ export const load: PageServerLoad = async ({fetch}) => {
         if(ex.register_startDate){
             const start = ex.register_startDate
             const end = ex.register_endDate
-            events.push({id,"title":"สมัคร:"+title,start,end,url,backgroundColor})
+            events.push({id,"title":"สมัคร:"+title,start,end,url, backgroundColor:'#67a1ff4a'})
         }
         if(ex.payment_startDate){
             const start = ex.payment_startDate
             const end = ex.payment_endDate
-            events.push({id,"title":"ชำระเงิน:"+title,start,end,url,backgroundColor})
+            events.push({id,"title":"ชำระเงิน:"+title,start,end,url,backgroundColor:'#D2B4DE'})
         }
         if(ex.examDate){
             const start = ex.examDate 
-            events.push({id,"title":"วันสอบ:"+title,start,url,backgroundColor})
+            events.push({id,"title":"วันสอบ:"+title,start,url,backgroundColor:'#a2d9ce8f'})
         }
     })
     return {exams,events}