diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..cf0c740
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\student\.android\avd\Pixel_2_API_30_2.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-10-27T09:24:30.735350Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
index be129c5..fb9712b 100644
--- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
@@ -1,5 +1,6 @@
 package org.ntlab.irisclient;
 
+import android.annotation.SuppressLint;
 import android.content.DialogInterface;
 import android.content.ClipData;
 import android.content.ClipDescription;
@@ -11,9 +12,11 @@
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ListView;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -25,6 +28,7 @@
 
 import org.ntlab.irisclient.entities.RoomJson;
 import org.ntlab.irisclient.models.Member;
+import org.ntlab.irisclient.models.Settings;
 import org.ntlab.irisclient.resources.RoomsRest;
 import org.ntlab.irisclient.viewmodels.RoomViewModel;
 
@@ -49,9 +53,14 @@
     //String nickname;
     String belongs;
     Boolean isMaster;
+    boolean drawingTimer = true;
+    int drawingTimes = 50;
+    boolean gameTimer = true;
+    int gameTimes = 30;
+    int gameFirstTimes = 10;
 
     private void homeButton(RoomViewModel roomViewModel){
-        String strTitle = "ホーム画面に戻ってよろしいですか？";
+        String strTitle = "ホーム画面に戻ってもよろしいですか？";
         String strMessage = "退出すると部屋は削除されます";
 
         AlertDialog.Builder builder;
@@ -124,6 +133,7 @@
         });
 
 
+
         //各ボタン処理
         ArrayList<String> members = new ArrayList<>();
         Button redMasterButton = (Button) findViewById(R.id.beRedMaster);
@@ -132,6 +142,10 @@
         Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy);
         ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton);
         ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton);
+        @SuppressLint("UseSwitchCompatOrMaterialCode")
+        Switch dTimer = findViewById(R.id.dTimer);
+        @SuppressLint("UseSwitchCompatOrMaterialCode")
+        Switch gTimer = findViewById(R.id.gTimer);
 
         //OwnerRoom専用ボタン
         Button randomButton = (Button) findViewById(R.id.random);
@@ -144,8 +158,6 @@
         redMasterButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(true);
-                ((Iris) getApplication()).setTeam("r");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"r",true);
             }
         });
@@ -154,8 +166,6 @@
         redSpyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(false);
-                ((Iris) getApplication()).setTeam("r");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"r",false);
             }
         });
@@ -164,8 +174,6 @@
         blueMasterButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(true);
-                ((Iris) getApplication()).setTeam("b");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",true);
             }
         });
@@ -174,8 +182,6 @@
         blueSpyButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ((Iris) getApplication()).setMaster(false);
-                ((Iris) getApplication()).setTeam("b");
                 roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false);
             }
         });
@@ -190,6 +196,26 @@
             }
         });
 
+/*
+        //設定ボタン
+        dTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+                drawingTimer = isChecked;
+                roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes);
+            }
+        });
+
+        gTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+                gameTimer = isChecked;
+                roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes);
+            }
+        });
+*/
         //ランダムボタン
         randomButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -219,9 +245,7 @@
 
         //---------------------------------------------------------------
         //settings情報
-        String s = "設定";
-        TextView settingsText = findViewById(R.id.settings);
-        settingsText.setText(s);
+
 
         //---------------------------------------------------------------
         //部屋ID情報
diff --git a/app/src/main/res/layout/activity_owner_room.xml b/app/src/main/res/layout/activity_owner_room.xml
index 48c02af..9706b38 100644
--- a/app/src/main/res/layout/activity_owner_room.xml
+++ b/app/src/main/res/layout/activity_owner_room.xml
@@ -7,6 +7,55 @@
     android:backgroundTint="#804747"
     tools:context=".OwnerRoomActivity">
 
+    <Switch
+        android:id="@+id/switch7"
+        android:layout_width="73dp"
+        android:layout_height="25dp"
+        android:layout_marginStart="20dp"
+        android:text="60s"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/beBlueMaster"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.697" />
+
+    <Switch
+        android:id="@+id/switch9"
+        android:layout_width="71dp"
+        android:layout_height="25dp"
+        android:text="90s"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.011"
+        app:layout_constraintStart_toEndOf="@+id/switch4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.697" />
+
+    <Switch
+        android:id="@+id/switch8"
+        android:layout_width="81dp"
+        android:layout_height="22dp"
+        android:text="120s"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.066"
+        app:layout_constraintStart_toEndOf="@+id/switch5"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.697" />
+
+    <ImageButton
+        android:id="@+id/homeButton"
+        android:layout_width="43dp"
+        android:layout_height="39dp"
+        android:layout_marginStart="4dp"
+        android:background="#FFFFFF"
+        android:padding="0dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.043"
+        app:srcCompat="@drawable/home_icon" />
+
     <Button
         android:id="@+id/beBlueSpy"
         android:layout_width="100dp"
@@ -73,11 +122,13 @@
         android:layout_width="165dp"
         android:layout_height="38dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
         android:text="部屋："
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/copyButton"
+        app:layout_constraintHorizontal_bias="0.227"
         app:layout_constraintStart_toEndOf="@+id/beRedMaster"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.042" />
 
     <ImageButton
         android:id="@+id/copyButton"
@@ -89,17 +140,46 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/copy_icon" />
 
-    <TextView
-        android:id="@+id/settings"
-        android:layout_width="201dp"
-        android:layout_height="44dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="16dp"
-        android:text="設定\nお絵描き"
+
+    <Switch
+        android:id="@+id/dTimer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="タイマー"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/roomID"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintHorizontal_bias="0.8"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.38"
+        tools:ignore="UseSwitchCompatOrMaterialXml" />
+
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="66dp"
+        android:layout_height="21dp"
+        android:layout_marginTop="8dp"
+        android:text="・ゲーム"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.754"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/switch4" />
+
+    <Switch
+        android:id="@+id/gTimer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        android:text="タイマー"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.8"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView5"
+        app:layout_constraintVertical_bias="0.012"
+        tools:ignore="UseSwitchCompatOrMaterialXml" />
 
     <Button
         android:id="@+id/random"
@@ -125,30 +205,67 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.939" />
 
-    <ImageButton
-        android:id="@+id/homeButton"
-        android:layout_width="43dp"
-        android:layout_height="39dp"
-        android:layout_marginStart="4dp"
-        android:background="#FFFFFF"
-        android:padding="0dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.043"
-        app:srcCompat="@drawable/home_icon" />
 
-    <Switch
-        android:id="@+id/switch1"
+    <TextView
+        android:id="@+id/textView6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="タイマー"
+        android:text="設定"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/textView8"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.727"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.876" />
+
+    <Switch
+        android:id="@+id/switch4"
+        android:layout_width="73dp"
+        android:layout_height="25dp"
+        android:layout_marginStart="20dp"
+        android:text="20s"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/beRedSpy"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.45" />
+
+    <Switch
+        android:id="@+id/switch5"
+        android:layout_width="71dp"
+        android:layout_height="25dp"
+        android:text="40s"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.818"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/switch4"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.45" />
+
+    <Switch
+        android:id="@+id/switch6"
+        android:layout_width="70dp"
+        android:layout_height="26dp"
+        android:text="60s"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/switch5"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.45" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="・お絵描き"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/dTimer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.772"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/settings"
-        app:layout_constraintVertical_bias="0.038" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="1.0" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file