diff --git a/components/booking/AvailableTimes.tsx b/components/booking/AvailableTimes.tsx
index bb690508..d55c2202 100644
--- a/components/booking/AvailableTimes.tsx
+++ b/components/booking/AvailableTimes.tsx
@@ -14,6 +14,7 @@ const AvailableTimes = ({
   timeFormat,
   user,
   organizerTimeZone,
+  height,
 }) => {
   const router = useRouter();
   const { rescheduleUid } = router.query;
@@ -27,9 +28,11 @@ const AvailableTimes = ({
   });
 
   return (
-    <div className="sm:pl-4 mt-8 sm:mt-0 text-center sm:w-1/3  md:max-h-97 overflow-y-auto">
-      <div className="text-gray-600 font-light text-xl mb-4 text-left">
-        <span className="w-1/2 dark:text-white text-gray-600">{date.format("dddd DD MMMM YYYY")}</span>
+    <div
+      className="sm:pl-4 mt-16 pt-4 pr-6 bg-neutral-50 dark:bg-neutral-800 rounded-r-sm border border-l-0 border-neutral-300 dark:border-neutral-700 text-center h-full overflow-y-auto"
+      style={{ maxHeight: height }}>
+      <div className="font-semibold mb-4 text-left border-b border-neutral-200 pb-4">
+        <span className="w-1/2 dark:text-white text-primary-500">{date.format("dddd DD MMMM YYYY")}</span>
       </div>
       {slots.length > 0 &&
         slots.map((slot) => (
@@ -39,7 +42,7 @@ const AvailableTimes = ({
                 `/${user.username}/book?date=${slot.utc().format()}&type=${eventTypeId}` +
                 (rescheduleUid ? "&rescheduleUid=" + rescheduleUid : "")
               }>
-              <a className="block font-medium mb-4 text-blue-600 border border-blue-600 rounded hover:text-white hover:bg-blue-600 py-4">
+              <a className="block font-medium mb-4 bg-white dark:bg-neutral-700 text-primary-500 dark:text-neutral-200 border border-primary-500 dark:border-neutral-600 rounded hover:text-white hover:bg-primary-500 dark:hover:bg-primary-500 dark:hover:border-primary-500 py-4">
                 {slot.format(timeFormat)}
               </a>
             </Link>
diff --git a/components/booking/DatePicker.tsx b/components/booking/DatePicker.tsx
index 3dddd1e5..e977ea04 100644
--- a/components/booking/DatePicker.tsx
+++ b/components/booking/DatePicker.tsx
@@ -1,4 +1,4 @@
-import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/solid";
+import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/outline";
 import { useEffect, useState } from "react";
 import dayjs, { Dayjs } from "dayjs";
 import utc from "dayjs/plugin/utc";
@@ -24,6 +24,7 @@ const DatePicker = ({
   periodDays,
   periodCountCalendarDays,
   minimumBookingNotice,
+  setHeight,
 }) => {
   const [calendar, setCalendar] = useState([]);
   const [selectedMonth, setSelectedMonth] = useState<number>();
@@ -147,12 +148,14 @@ const DatePicker = ({
           onClick={() => setSelectedDate(inviteeDate.date(day))}
           disabled={isDisabled(day)}
           className={
-            "text-center w-10 h-10 rounded-full mx-auto" +
-            (isDisabled(day) ? " text-gray-400 font-light" : " text-blue-600 font-medium") +
+            "w-36 mx-auto h-28 mx-auto p-3 text-left flex self-start" +
+            (isDisabled(day)
+              ? " text-neutral-400 font-light"
+              : " text-neutral-900 dark:text-neutral-200 font-medium") +
             (selectedDate && selectedDate.isSame(inviteeDate.date(day), "day")
-              ? " bg-blue-600 text-white-important"
+              ? " bg-neutral-100 dark:bg-neutral-700 border border-neutral-900 dark:border-neutral-600 dark:text-white"
               : !isDisabled(day)
-              ? " bg-blue-50 dark:bg-gray-900 dark:bg-opacity-30"
+              ? " bg-neutral-100 dark:bg-neutral-700 dark:bg-opacity-30"
               : "")
           }>
           {day}
@@ -162,35 +165,44 @@ const DatePicker = ({
   }, [selectedMonth, inviteeTimeZone, selectedDate]);
 
   return selectedMonth ? (
-    <div
-      className={
-        "mt-8 sm:mt-0 " +
-        (selectedDate ? "sm:w-1/3 sm:border-r sm:dark:border-gray-900 sm:px-4" : "sm:w-1/2 sm:pl-4")
-      }>
-      <div className="flex text-gray-600 font-light text-xl mb-4 ml-2">
-        <span className="w-1/2 text-gray-600 dark:text-white">
-          {dayjs().month(selectedMonth).format("MMMM YYYY")}
-        </span>
+    <div className="mt-8 sm:mt-0">
+      <div className="flex text-gray-600 text-xl mb-8">
+        <div className="w-1/2 text-2xl">
+          <span className="font-semibold text-neutral-900 dark:text-white">
+            {dayjs().month(selectedMonth).format("MMMM")}
+          </span>
+          &nbsp;
+          <span className="text-neutral-400">{dayjs().month(selectedMonth).format("YYYY")}</span>
+        </div>
         <div className="w-1/2 text-right text-gray-600 dark:text-gray-400">
           <button
             onClick={decrementMonth}
             className={
-              "mr-4 " +
-              (selectedMonth <= dayjs().tz(inviteeTimeZone).month() && "text-gray-400 dark:text-gray-600")
+              "p-1 bg-white dark:bg-neutral-800 dark:border-neutral-700 dark:text-white rounded-sm border border-neutral-300 text-black mr-4 " +
+              (selectedMonth <= dayjs().tz(inviteeTimeZone).month() && "opacity-50")
             }
             disabled={selectedMonth <= dayjs().tz(inviteeTimeZone).month()}>
             <ChevronLeftIcon className="w-5 h-5" />
           </button>
-          <button onClick={incrementMonth}>
+          <button
+            className="p-1 bg-white dark:bg-neutral-800 dark:border-neutral-700 dark:text-white rounded-sm border border-neutral-300"
+            onClick={incrementMonth}>
             <ChevronRightIcon className="w-5 h-5" />
           </button>
         </div>
       </div>
-      <div className="grid grid-cols-7 gap-y-4 text-center">
+      <div
+        className="bg-white dark:bg-neutral-800 p-6 rounded-l-sm border border-neutral-300 dark:border-neutral-700 grid grid-cols-7 gap-y-4"
+        ref={(el) => {
+          if (!el) return;
+          setHeight(el.getBoundingClientRect().height);
+        }}>
         {["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
           .sort((a, b) => (weekStart.startsWith(a) ? -1 : weekStart.startsWith(b) ? 1 : 0))
           .map((weekDay) => (
-            <div key={weekDay} className="uppercase text-gray-400 text-xs tracking-widest">
+            <div
+              key={weekDay}
+              className="uppercase text-neutral-600 text-xs tracking-widest border-b border-neutral-200 dark:border-neutral-700 pb-4">
               {weekDay}
             </div>
           ))}
diff --git a/pages/[user]/[type].tsx b/pages/[user]/[type].tsx
index 1599791d..86136631 100644
--- a/pages/[user]/[type].tsx
+++ b/pages/[user]/[type].tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { GetServerSideProps, GetServerSidePropsContext } from "next";
 import Head from "next/head";
-import { ChevronDownIcon, ClockIcon, GlobeIcon } from "@heroicons/react/solid";
+import { ChevronDownIcon, ClockIcon, GlobeIcon, InformationCircleIcon } from "@heroicons/react/solid";
 import { useRouter } from "next/router";
 import dayjs, { Dayjs } from "dayjs";
 import * as Collapsible from "@radix-ui/react-collapsible";
@@ -30,6 +30,8 @@ export default function Type(props): Type {
   const [timeFormat, setTimeFormat] = useState("h:mma");
   const telemetry = useTelemetry();
 
+  const [calHeight, setCalHeight] = useState(0);
+
   useEffect(() => {
     handleToggle24hClock(localStorage.getItem("timeOption.is24hClock") === "true");
     telemetry.withJitsu((jitsu) => jitsu.track(telemetryEventTypes.pageView, collectPageParameters()));
@@ -79,7 +81,7 @@ export default function Type(props): Type {
 
   return (
     isReady && (
-      <div>
+      <div className="bg-neutral-50 dark:bg-neutral-900 h-screen">
         <Head>
           <title>
             {rescheduleUid && "Reschedule"} {props.eventType.title} | {props.user.name || props.user.username}{" "}
@@ -126,73 +128,72 @@ export default function Type(props): Type {
             }
           />
         </Head>
-        <main
-          className={
-            "mx-auto my-0 sm:my-24 transition-max-width ease-in-out duration-500 " +
-            (selectedDate ? "max-w-6xl" : "max-w-3xl")
-          }>
-          <div className="dark:bg-gray-800 bg-white sm:shadow sm:rounded-lg">
-            <div className="sm:flex px-4 py-5 sm:p-4">
-              <div
-                className={
-                  "pr-8 sm:border-r sm:dark:border-gray-900 " + (selectedDate ? "sm:w-1/3" : "sm:w-1/2")
-                }>
-                <Avatar user={props.user} className="w-16 h-16 rounded-full mb-4" />
-                <h2 className="font-medium dark:text-gray-300 text-gray-500">{props.user.name}</h2>
-                <h1 className="text-3xl font-semibold dark:text-white text-gray-800 mb-4">
-                  {props.eventType.title}
-                </h1>
-                <p className="text-gray-500 mb-1 px-2 py-1 -ml-2">
-                  <ClockIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
-                  {props.eventType.length} minutes
-                </p>
-
-                <Collapsible.Root open={isTimeOptionsOpen} onOpenChange={setIsTimeOptionsOpen}>
-                  <Collapsible.Trigger className="text-gray-500 mb-1 px-2 py-1 -ml-2">
-                    <GlobeIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
-                    {timeZone()}
-                    <ChevronDownIcon className="inline-block w-4 h-4 ml-1 -mt-1" />
-                  </Collapsible.Trigger>
-                  <Collapsible.Content>
-                    <TimeOptions
-                      onSelectTimeZone={handleSelectTimeZone}
-                      onToggle24hClock={handleToggle24hClock}
-                    />
-                  </Collapsible.Content>
-                </Collapsible.Root>
-
-                <p className="dark:text-gray-200 text-gray-600 mt-3 mb-8">{props.eventType.description}</p>
-              </div>
-              <DatePicker
-                date={selectedDate}
-                periodType={props.eventType?.periodType}
-                periodStartDate={props.eventType?.periodStartDate}
-                periodEndDate={props.eventType?.periodEndDate}
-                periodDays={props.eventType?.periodDays}
-                periodCountCalendarDays={props.eventType?.periodCountCalendarDays}
-                weekStart={props.user.weekStart}
-                onDatePicked={changeDate}
-                workingHours={props.workingHours}
-                organizerTimeZone={props.eventType.timeZone || props.user.timeZone}
-                inviteeTimeZone={timeZone()}
-                eventLength={props.eventType.length}
-                minimumBookingNotice={props.eventType.minimumBookingNotice}
-              />
-              {selectedDate && (
-                <AvailableTimes
-                  workingHours={props.workingHours}
-                  timeFormat={timeFormat}
-                  organizerTimeZone={props.eventType.timeZone || props.user.timeZone}
-                  minimumBookingNotice={props.eventType.minimumBookingNotice}
-                  eventTypeId={props.eventType.id}
-                  eventLength={props.eventType.length}
-                  date={selectedDate}
-                  user={props.user}
+        <main className={"flex sm:py-12 w-11/12 mx-auto"}>
+          <div className="w-2/12 md:pt-32">
+            <Avatar user={props.user} className="w-12 h-12 rounded-full mb-4" />
+            <h1 className="text-xl font-semibold dark:text-neutral-100 text-neutral-900 mb-2">
+              {props.user.name}
+            </h1>
+            <p className="text-neutral-500 mb-1 px-2 py-1 -ml-2">
+              <InformationCircleIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
+              {props.eventType.title}
+            </p>
+            <p className="text-neutral-500 mb-1 px-2 py-1 -ml-2">
+              <ClockIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
+              {props.eventType.length} minutes
+            </p>
+            <Collapsible.Root open={isTimeOptionsOpen} onOpenChange={setIsTimeOptionsOpen}>
+              <Collapsible.Trigger className="text-neutral-500 mb-1 px-2 py-1 -ml-2">
+                <GlobeIcon className="inline-block w-4 h-4 mr-1 -mt-1" />
+                {timeZone()}
+                <ChevronDownIcon className="inline-block w-4 h-4 ml-1 -mt-1" />
+              </Collapsible.Trigger>
+              <Collapsible.Content>
+                <TimeOptions
+                  onSelectTimeZone={handleSelectTimeZone}
+                  onToggle24hClock={handleToggle24hClock}
                 />
-              )}
-            </div>
+              </Collapsible.Content>
+            </Collapsible.Root>
           </div>
-          {!props.user.hideBranding && <PoweredByCalendso />}
+          <div className="w-8/12">
+            <DatePicker
+              date={selectedDate}
+              periodType={props.eventType?.periodType}
+              periodStartDate={props.eventType?.periodStartDate}
+              periodEndDate={props.eventType?.periodEndDate}
+              periodDays={props.eventType?.periodDays}
+              periodCountCalendarDays={props.eventType?.periodCountCalendarDays}
+              weekStart={props.user.weekStart}
+              onDatePicked={changeDate}
+              workingHours={props.workingHours}
+              organizerTimeZone={props.eventType.timeZone || props.user.timeZone}
+              inviteeTimeZone={timeZone()}
+              eventLength={props.eventType.length}
+              minimumBookingNotice={props.eventType.minimumBookingNotice}
+              setHeight={setCalHeight}
+            />
+          </div>
+          <div className="w-2/12">
+            {selectedDate && (
+              <AvailableTimes
+                workingHours={props.workingHours}
+                timeFormat={timeFormat}
+                organizerTimeZone={props.eventType.timeZone || props.user.timeZone}
+                minimumBookingNotice={props.eventType.minimumBookingNotice}
+                eventTypeId={props.eventType.id}
+                eventLength={props.eventType.length}
+                date={selectedDate}
+                user={props.user}
+                height={calHeight}
+              />
+            )}
+          </div>
+          {!props.user.hideBranding && (
+            <div className="absolute top-4 right-4">
+              <PoweredByCalendso />
+            </div>
+          )}
         </main>
       </div>
     )
diff --git a/pages/_document.tsx b/pages/_document.tsx
index db2625ed..6ec9ef95 100644
--- a/pages/_document.tsx
+++ b/pages/_document.tsx
@@ -18,7 +18,7 @@ class MyDocument extends Document {
           <meta name="msapplication-TileColor" content="#ff0000" />
           <meta name="theme-color" content="#ffffff" />
         </Head>
-        <body className="dark:bg-gray-900 bg-white">
+        <body className="dark:bg-neutral-900 bg-white">
           <Main />
           <NextScript />
         </body>