diff --git a/app/(auth)/(routes)/login/page.tsx b/app/(auth)/(routes)/login/page.tsx
index 22fd4f1..2fa9df5 100644
--- a/app/(auth)/(routes)/login/page.tsx
+++ b/app/(auth)/(routes)/login/page.tsx
@@ -11,7 +11,7 @@ export const metadata: Metadata = {
 export default function LoginPage() {
   return (
     <>
-      <h1 className="mx-auto mb-4 w-fit text-large font-bold">ログイン</h1>
+      <h1 className="mx-auto mb-4 w-fit text-large">ログイン</h1>
       <SocialProviders />
       <div className="my-4 flex items-center gap-4">
         <Divider className="shrink" />
diff --git a/app/(auth)/(routes)/register/page.tsx b/app/(auth)/(routes)/register/page.tsx
index 26fa7f6..1a7c911 100644
--- a/app/(auth)/(routes)/register/page.tsx
+++ b/app/(auth)/(routes)/register/page.tsx
@@ -19,9 +19,7 @@ export default async function RegisterPage() {
 
   return (
     <>
-      <h1 className="mx-auto mb-2 w-fit text-large font-bold">
-        ユーザー情報登録
-      </h1>
+      <h1 className="mx-auto mb-2 w-fit text-large">ユーザー情報登録</h1>
       <p className="mb-6 mt-4 text-small text-foreground-light">
         ユーザーIDと名前を決めてください。
         <br />
diff --git a/app/(auth)/(routes)/sign-up/page.tsx b/app/(auth)/(routes)/sign-up/page.tsx
index 60b7c84..4ba5d87 100644
--- a/app/(auth)/(routes)/sign-up/page.tsx
+++ b/app/(auth)/(routes)/sign-up/page.tsx
@@ -9,7 +9,7 @@ export const metadata: Metadata = {
 export default function SignUpPage() {
   return (
     <>
-      <h1 className="mx-auto mb-2 w-fit text-large font-bold">新規登録</h1>
+      <h1 className="mx-auto mb-2 w-fit text-large">新規登録</h1>
       <SignUpForm />
       <p className="text-center text-small">
         既にアカウントをお持ちの方は
diff --git a/app/(lp)/page.tsx b/app/(lp)/page.tsx
index f40b0e2..91490d9 100644
--- a/app/(lp)/page.tsx
+++ b/app/(lp)/page.tsx
@@ -126,16 +126,12 @@ export default function LandingPage() {
       <div className="container mx-auto space-y-24 px-5 py-16">
         {/* 機能紹介 */}
         <section id="features" className="">
-          <h2 className="mb-12 text-center text-large font-semibold">
-            主な機能
-          </h2>
+          <h2 className="mb-12 text-center text-large">主な機能</h2>
           <div className="grid grid-cols-1 gap-8 md:grid-cols-2 lg:grid-cols-4">
             {features.map((feature, index) => (
               <Card key={index} className="px-3">
                 <CardBody className="py-8">
-                  <h3 className="mb-2 text-center font-semibold">
-                    {feature.title}
-                  </h3>
+                  <h3 className="mb-2 text-center">{feature.title}</h3>
                   <p>{feature.description}</p>
                 </CardBody>
               </Card>
@@ -146,18 +142,14 @@ export default function LandingPage() {
         {/* 使用方法 */}
         <section className="">
           <div className="container mx-auto">
-            <h2 className="mb-12 text-center text-large font-semibold">
-              使い方
-            </h2>
+            <h2 className="mb-12 text-center text-large">使い方</h2>
             <div className="grid grid-cols-1 gap-8 md:grid-cols-2 lg:grid-cols-4">
               {steps.map((step) => (
                 <div key={step.number} className="text-center">
-                  <div className="mx-auto mb-4 flex size-16 items-center justify-center rounded-full bg-secondary text-large font-bold text-secondary-foreground">
+                  <div className="mx-auto mb-4 flex size-16 items-center justify-center rounded-full bg-secondary text-large text-secondary-foreground">
                     {step.number}
                   </div>
-                  <h3 className="mb-2 text-medium font-semibold">
-                    {step.title}
-                  </h3>
+                  <h3 className="mb-2 text-medium">{step.title}</h3>
                   <p>{step.description}</p>
                 </div>
               ))}
@@ -168,9 +160,7 @@ export default function LandingPage() {
         {/* FAQ */}
         <section className="">
           <div className="container mx-auto">
-            <h2 className="mb-12 text-center text-large font-semibold">
-              よくある質問
-            </h2>
+            <h2 className="mb-12 text-center text-large">よくある質問</h2>
             <FAQ faqs={faqs} />
           </div>
         </section>
diff --git a/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx b/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx
index 215f055..339a5d6 100644
--- a/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx
+++ b/app/(main)/(components)/Appbar/Avatar/Menu/index.tsx
@@ -39,8 +39,8 @@ export function AppbarAvatarMenu({
         className="h-14 gap-2"
         textValue={`${name}@${displayId}`}
       >
-        <p className="text-wrap break-all font-semibold">{name}</p>
-        <p className="text-wrap break-all font-semibold">@{displayId}</p>
+        <p className="text-wrap break-all">{name}</p>
+        <p className="text-wrap break-all">@{displayId}</p>
       </DropdownItem>
       <DropdownItem key="friends">フレンド</DropdownItem>
       <DropdownItem key="signOut" color="danger">
diff --git a/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx b/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx
index 6d7b0d3..0e280fa 100644
--- a/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx
+++ b/app/(main)/(routes)/matches/(components)/MatchCard/index.tsx
@@ -20,7 +20,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
     <NavigationCard matchId={match.id}>
       <CardHeader>
         <div className="flex w-full items-center justify-between">
-          <p className="font-bold">{displayDate}</p>
+          <p>{displayDate}</p>
           <AvatarGroup size="sm" isBordered max={4}>
             {match.players.map((player) => (
               <Avatar key={player.id} />
@@ -33,7 +33,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
         <div className="flex items-center">
           <div className="flex grow flex-col items-center px-8">
             <div className="mb-2 text-tiny text-foreground-light">平均着順</div>
-            <div className="text-large font-bold">
+            <div className="text-large">
               {data.averageRank?.toFixed(2) ?? "なし"}
             </div>
           </div>
@@ -47,7 +47,7 @@ export function MatchCard({ match, userId }: { match: Match; userId: string }) {
                   {match.rule.playersCount === 4 && <th>4位</th>}
                 </tr>
               </thead>
-              <tbody className="text-small font-bold">
+              <tbody className="text-small">
                 <tr>
                   <td>{data.rankCounts[0]}</td>
                   <td>{data.rankCounts[1]}</td>
diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx
index ade11da..cf90538 100644
--- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx
+++ b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/(components)/GameRow/index.tsx
@@ -5,16 +5,16 @@ import { GameUpdateModal, useGameUpdateModal } from "../GameUpdateModal";
 
 export function GameRow({
   index,
-  className,
   children,
   matchId,
   gameId,
+  style,
 }: {
   index: number;
-  className?: string;
   children: React.ReactNode;
   matchId: string;
   gameId: string;
+  style?: React.CSSProperties;
 }) {
   const gameUpdateModal = useGameUpdateModal();
   return (
@@ -22,8 +22,9 @@ export function GameRow({
       <Card
         isPressable
         isHoverable
-        className={className}
+        className="bg-transparent shadow-none"
         onPress={gameUpdateModal.onOpen}
+        style={style}
       >
         {children}
       </Card>
diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx
index e7913ca..8eec431 100644
--- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx
+++ b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/index.tsx
@@ -1,4 +1,5 @@
 import classNames from "classnames";
+import { CSSProperties } from "react";
 import { Icon } from "@/components/Icon";
 import { serverServices } from "@/lib/services/server";
 import { MatchPlayer } from "@/lib/type";
@@ -6,7 +7,6 @@ import { ChipModalTrigger } from "../ChipModal";
 import { GameModalTrigger } from "../GameModal";
 import { PlayersModalTrigger } from "../PlayersModal";
 import { GameRow } from "./(components)/GameRow";
-import styles from "./styles.module.css";
 
 type Column = {
   id: string;
@@ -67,150 +67,121 @@ export async function MatchTable({
       ),
     })) ?? [];
 
+  const rowStyle: CSSProperties = {
+    display: "grid",
+    gridTemplateColumns: `46px repeat(${columns.length}, minmax(80px, 1fr))`,
+    width: "100%",
+  };
+
   return (
-    <div className={classNames(className, "flex flex-col")}>
-      <PlayersModalTrigger
-        className={classNames(
-          styles["row"],
-          "flex items-center rounded-lg bg-default-100 text-foreground-500",
-        )}
-      >
-        <div
-          className={classNames(
-            styles["col"],
-            styles["col--header"],
-            styles["col--index"],
+    <div className={classNames(className, "overflow-x-auto pb-4")}>
+      <div className="flex h-full min-w-fit flex-col">
+        {/* ヘッダー */}
+        <PlayersModalTrigger
+          style={rowStyle}
+          className="rounded-lg bg-default-100 text-foreground-500"
+        >
+          <div />
+          {columns.map((column) => (
+            <div key={column?.id} className="truncate px-1 py-3 text-tiny">
+              {column.name}
+            </div>
+          ))}
+        </PlayersModalTrigger>
+        {/* ボディ */}
+        <div className="grow">
+          {gameRows.length === 0 && (
+            <p className="my-10 text-center text-small text-foreground-light">
+              まだデータはありません
+            </p>
           )}
-        />
-        {columns.map((column) => (
-          <div
-            key={column?.id}
-            className={classNames(styles["col--header"], styles["col"])}
-          >
-            {column.type === "player" && (
-              <span className="truncate">{column.name}</span>
-            )}
-          </div>
-        ))}
-      </PlayersModalTrigger>
-      <div className="grow">
-        {gameRows.length === 0 && (
-          <p className="my-10 text-center text-small text-foreground-light">
-            まだデータはありません
-          </p>
-        )}
-        {gameRows.length > 0 && (
-          <ol className="py-1">
-            {gameRows.map((item, index) => (
-              <li key={item.gameId}>
-                <GameRow
-                  index={index}
-                  matchId={matchId}
-                  gameId={item.gameId}
-                  className={classNames(
-                    styles["row"],
-                    "flex w-full flex-row items-center bg-transparent shadow-none",
-                  )}
-                >
+          {gameRows.length > 0 &&
+            gameRows.map((item, index) => (
+              <GameRow
+                key={item.gameId}
+                index={index}
+                matchId={matchId}
+                gameId={item.gameId}
+                style={rowStyle}
+              >
+                <div className="flex h-full items-center justify-center truncate px-1 py-2 text-tiny text-default-500">
+                  {index + 1}
+                </div>
+                {columns.map((column) => (
                   <div
+                    key={column.id}
                     className={classNames(
-                      styles["col"],
-                      styles["col--index"],
-                      styles["col--body"],
+                      "truncate px-1 py-2 text-center text-small",
+                      {
+                        "text-danger": item.players[column.id] < 0,
+                      },
                     )}
                   >
-                    {index + 1}
+                    {item.players[column.id]}
                   </div>
-                  {columns.map((column) => (
-                    <div
-                      key={column.id}
-                      className={classNames(
-                        styles["col"],
-                        styles["col--body"],
-                        {
-                          "text-danger": item.players[column.id] < 0,
-                        },
-                      )}
-                    >
-                      {item.players[column.id]}
-                    </div>
-                  ))}
-                </GameRow>
-              </li>
+                ))}
+              </GameRow>
             ))}
-          </ol>
-        )}
-        <GameModalTrigger
-          fullWidth
-          size="lg"
-          startContent={<Icon className="size-5" name="edit" />}
-          variant="ghost"
-          isPlayersShort={isPlayersShort}
-        >
-          結果を入力する
-        </GameModalTrigger>
-      </div>
-      <div className="mt-3 rounded-lg bg-default-100 text-foreground-500">
-        <div className={classNames(styles["row"])}>
-          <div
-            className={classNames(
-              styles["col"],
-              styles["col--index"],
-              styles["col--footer"],
-            )}
+          <GameModalTrigger
+            fullWidth
+            size="lg"
+            startContent={<Icon className="size-5" name="edit" />}
+            variant="ghost"
+            isPlayersShort={isPlayersShort}
           >
-            合計
-          </div>
-          {columns.map((column) => (
-            <div
-              className={classNames(styles["col"], styles["col--footer"], {
-                "text-danger": column.totalScore < 0,
-              })}
-              key={column.id}
-            >
-              {column.totalScore}
-            </div>
-          ))}
+            結果を入力する
+          </GameModalTrigger>
         </div>
-        <ChipModalTrigger className={classNames(styles["row"], "w-full")}>
-          <div
-            className={classNames(
-              styles["col"],
-              styles["col--index"],
-              styles["col--footer"],
-            )}
-          >
-            チップ
-          </div>
-          {columns.map((column) => (
-            <div
-              className={classNames(styles["col"], styles["col--footer"])}
-              key={column.id}
-            >
-              {column.chipCount}
-              {column.chipCount !== null && <span>枚</span>}
+        {/* フッター */}
+        <div className="mt-3 rounded-lg bg-default-100 text-foreground-500">
+          <div className="min-h-10" style={rowStyle}>
+            <div className="flex h-full items-center justify-center truncate break-all px-1 py-3 text-tiny">
+              合計
             </div>
-          ))}
-        </ChipModalTrigger>
-        <div className={classNames(styles["row"])}>
-          <div
-            className={classNames(
-              styles["col"],
-              styles["col--index"],
-              styles["col--footer"],
-            )}
-          >
-            収支
+            {columns.map((column) => (
+              <div
+                className={classNames(
+                  "flex h-full items-center justify-center px-1 text-center text-tiny",
+                  {
+                    "text-danger": column.totalScore < 0,
+                  },
+                )}
+                key={column.id}
+              >
+                {column.totalScore}
+              </div>
+            ))}
           </div>
-          {columns.map((column) => (
-            <div
-              className={classNames(styles["col"], styles["col--footer"])}
-              key={column.id}
-            >
-              {column.result}
-              <span>円</span>
+          <ChipModalTrigger className="min-h-10" style={rowStyle}>
+            <div className="flex h-full items-center justify-center truncate px-1 text-tiny">
+              チップ
             </div>
-          ))}
+            {columns.map((column) => (
+              <div
+                className="flex h-full items-center justify-center break-all px-1 py-3 text-center text-tiny"
+                key={column.id}
+              >
+                {column.chipCount}
+                {column.chipCount !== null && (
+                  <span className="text-[10px]">枚</span>
+                )}
+              </div>
+            ))}
+          </ChipModalTrigger>
+          <div className="min-h-10" style={rowStyle}>
+            <div className="flex h-full items-center justify-center truncate px-1 text-tiny">
+              収支
+            </div>
+            {columns.map((column) => (
+              <div
+                className="flex h-full items-center justify-center break-all px-1 py-3 text-center text-tiny"
+                key={column.id}
+              >
+                {column.result}
+                <span className="text-[10px]">円</span>
+              </div>
+            ))}
+          </div>
         </div>
       </div>
     </div>
diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/styles.module.css b/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/styles.module.css
deleted file mode 100644
index c2c1e2d..0000000
--- a/app/(main)/(routes)/matches/(routes)/[matchId]/(components)/MatchTable/styles.module.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.row {
-  @apply flex;
-}
-
-.col {
-  @apply flex-1 flex items-center justify-center;
-}
-
-.col--index {
-  @apply basis-[46px] grow-0 shrink-0 text-default-500;
-}
-
-.col--header {
-  @apply h-10 whitespace-nowrap px-1 text-left align-middle text-tiny font-semibold;
-}
-
-.col--body {
-  @apply px-1 py-2 align-middle text-small font-normal;
-}
-
-.col--footer {
-  @apply h-10 whitespace-nowrap px-1 align-middle text-tiny font-semibold;
-}
diff --git a/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx b/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx
index 18eac07..78b40af 100644
--- a/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx
+++ b/app/(main)/(routes)/matches/(routes)/[matchId]/page.tsx
@@ -21,14 +21,14 @@ export default async function Match({
 
   return (
     <MatchContextProvider>
-      <div className="flex h-full flex-col pb-5">
+      <div className="flex h-full flex-col">
         <div className="mb-1 flex items-center justify-between">
           <div className="flex items-center gap-1">
             <Button isIconOnly variant="light" as={Link} href="/matches">
               <Icon className="size-4 fill-current" name="back" />
             </Button>
             {/* TODO: fetch */}
-            {/* <p className="font-bold">{displayDate}</p> */}
+            {/* <p>{displayDate}</p> */}
           </div>
           <div className="flex items-center gap-0.5">
             <Button isIconOnly variant="light" as={DataModalTrigger}>
diff --git a/app/globals.css b/app/globals.css
index 045d29b..1cfdfd6 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -22,7 +22,7 @@
   }
 
   .heading-1 {
-    @apply text-medium text-foreground-light font-bold;
+    @apply text-medium text-foreground-light;
   }
 }
 
diff --git a/components/Table/index.tsx b/components/Table/index.tsx
deleted file mode 100644
index 47e3966..0000000
--- a/components/Table/index.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import classNames from "classnames";
-
-// nextui tableにfooterがないのでclassだけ踏襲して作成
-export function Table({ children }: { children: React.ReactNode }) {
-  return <table className="size-full min-w-full table-auto">{children}</table>;
-}
-
-export function TableHeader({ children }: { children: React.ReactNode }) {
-  return (
-    <thead className="[&>tr]:first:rounded-lg">
-      <tr className="outline-none">{children}</tr>
-      <tr
-        aria-hidden="true"
-        className="block size-px"
-        style={{
-          marginLeft: "0.25rem",
-          marginTop: "0.25rem",
-        }}
-      ></tr>
-    </thead>
-  );
-}
-
-export function TableColumn({
-  children,
-  className,
-}: {
-  children: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <th
-      className={classNames(
-        "group h-10 whitespace-nowrap bg-default-100 px-1 text-left align-middle text-tiny font-semibold text-foreground-500 outline-none first:rounded-l-lg last:rounded-r-lg",
-        className,
-      )}
-    >
-      {children}
-    </th>
-  );
-}
-
-export function TableBody({ children }: { children: React.ReactNode }) {
-  return <tbody>{children}</tbody>;
-}
-
-export function TableRow({ children }: { children: React.ReactNode }) {
-  return <tr className="group outline-none">{children}</tr>;
-}
-
-export function TableCell({
-  children,
-  className,
-}: {
-  children: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <td
-      className={classNames(
-        "relative whitespace-normal px-1 py-2 align-middle text-small font-normal outline-none before:absolute before:inset-0 before:z-0 before:bg-default/40 before:opacity-0 before:content-[''] first:before:rounded-l-lg last:before:rounded-r-lg [&>*]:relative",
-        className,
-      )}
-    >
-      {children}
-    </td>
-  );
-}
-
-export function TableFooter({ children }: { children: React.ReactNode }) {
-  return (
-    <tfoot>
-      <tr
-        aria-hidden="true"
-        className="block size-px"
-        style={{
-          marginLeft: "0.25rem",
-          marginTop: "0.25rem",
-        }}
-      ></tr>
-      {children}
-    </tfoot>
-  );
-}
-
-export function TableFooterRow({ children }: { children: React.ReactNode }) {
-  return <tr className="group">{children}</tr>;
-}
-
-export function TableFooterCell({
-  children,
-  className,
-}: {
-  children: React.ReactNode;
-  className?: string;
-}) {
-  return (
-    <td
-      className={classNames(
-        "h-10 whitespace-nowrap bg-default-100 px-1 text-left align-middle text-tiny font-semibold text-foreground-500 outline-none group-[:nth-of-type(2)]:first:rounded-tl-lg group-[:nth-of-type(2)]:last:rounded-tr-lg group-last:first:rounded-bl-lg group-last:last:rounded-br-lg",
-        className,
-      )}
-    >
-      {children}
-    </td>
-  );
-}
diff --git a/package-lock.json b/package-lock.json
index 38d98e4..a17125c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "jankiroku",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jankiroku",
-      "version": "0.1.5",
+      "version": "0.1.6",
       "license": "ISC",
       "dependencies": {
         "@dnd-kit/sortable": "10.0.0",
@@ -33,7 +33,7 @@
       "devDependencies": {
         "@commitlint/cli": "19.6.1",
         "@commitlint/config-conventional": "19.6.0",
-        "@types/node": "22.10.4",
+        "@types/node": "22.10.5",
         "@types/react": "19.0.2",
         "@types/react-dom": "19.0.2",
         "autoprefixer": "10.4.20",
@@ -6285,9 +6285,9 @@
       "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
     },
     "node_modules/@types/node": {
-      "version": "22.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.4.tgz",
-      "integrity": "sha512-99l6wv4HEzBQhvaU/UGoeBoCK61SCROQaCCGyQSgX2tEQ3rKkNZ2S7CEWnS/4s1LV+8ODdK21UeyR1fHP2mXug==",
+      "version": "22.10.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
+      "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
diff --git a/package.json b/package.json
index b533e02..d9523ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jankiroku",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -66,7 +66,7 @@
   "devDependencies": {
     "@commitlint/cli": "19.6.1",
     "@commitlint/config-conventional": "19.6.0",
-    "@types/node": "22.10.4",
+    "@types/node": "22.10.5",
     "@types/react": "19.0.2",
     "@types/react-dom": "19.0.2",
     "autoprefixer": "10.4.20",