diff --git a/src/navigation/AppRoutes.js b/src/navigation/AppRoutes.js
index 0329545..c9e1d94 100644
--- a/src/navigation/AppRoutes.js
+++ b/src/navigation/AppRoutes.js
@@ -10,20 +10,52 @@ import { strings } from '../utils/i18n';
 import { initSQLite } from '../services/sqlite';
 
 // Screens
+import NotificationScreen from '../screens/Notification'
 import BottomTabNavigator from './BottomTabNavigator'
 import LoginScreen from '../screens/Login'
-import LanguageSettingScreen from '../screens/LanguageSetting';
 import DailyReportScreen from '../screens/daily-report-page/index'
 import ServiceScreen from '../screens/Service'
 import IncidentScreen from '../screens/incident-page/index'
-import DialogFormIncident from '../screens/incident-page/dialogFrom'
+import DialogFormIncident from '../screens/incident-page/dialogForm'
 import SearchPage from '../components/SearchPage';
 import LocationScreen from '../screens/incident-page/stepComponent/location';
 import ContainedActionScreen from '../screens/incident-page/stepComponent/containedAction'
 import PresenceScreen from '../screens/presence';
 import PatroliScreen from '../screens/patroli';
 import DialogFormPatroli from '../screens/patroli/dialogForm';
-import PageDetailPatroli from '../screens/patroli/detail'
+import DialogFormReport from '../screens/patroli/report'
+import ActivityScreen from '../screens/activity/index'
+import DialogFormDailyReport from '../screens/daily-report-page/dialogform'
+import ManpowerScreen from '../screens/daily-report-page/stepComponent/manPower'
+import VisitScreen from '../screens/daily-report-page/stepComponent/visit'
+import SpesialRequestScreen from '../screens/daily-report-page/stepComponent/spesialRequest'
+import TrainingScreen from '../screens/daily-report-page/stepComponent/training'
+import InformationScreen from '../screens/daily-report-page/stepComponent/informationReport'
+import ShiftScreen from '../screens/activity/shift/index'
+import DialogFormShift from '../screens/activity/shift/dialogForm'
+import MutationBookScreen from '../screens/activity/mutationBook/index'
+import DialogFormMutationBook from '../screens/activity/mutationBook/dialogForm'
+import PersonelScreen from '../screens/activity/personel';
+import SpesialRequestAcitivityScreen from '../screens/activity/spesialRequest/index';
+import DialogFormSpesialRequest from '../screens/activity/spesialRequest/dialogForm';
+import VisitActivityScreen from '../screens/activity/visit/index'
+import DialogFormVisit from '../screens/activity/visit/dialogForm'
+import TrainingActivityScreen from '../screens/activity/training/index';
+import DialogFormTraining from '../screens/activity/training/dialogFrom';
+import ActionActivityScreen from '../screens/activity/activity/index'
+import DialogFormActivity from '../screens/activity/activity/dialogForm'
+import BriefScreen from '../screens/activity/brief/index'
+import DialogFormBrief from '../screens/activity/brief/dialogForm'
+import InformationDetailScreen from '../screens/daily-report-page/stepComponent/informationDetail'
+import PatroliDRScreen from '../screens/daily-report-page/stepComponent/patroli'
+import RegisterScreen from '../screens/registerPage/index'
+import BKOScreen from '../screens/daily-report-page/stepComponent/bko'
+import PPEScreen from '../screens/activity/projectAset/ppe/index';
+import DialogFormPPE from '../screens/activity/projectAset/ppe/dialogForm';
+import PostScreen from '../screens/activity/projectAset/post/index';
+import DialogFormPost from '../screens/activity/projectAset/post/dialogForm';
+import ProjectScreen from '../screens/activity/projectAset/project/index';
+import DialogFormProject from '../screens/activity/projectAset/project/dialogForm';
 
 const Stack = createNativeStackNavigator();
 
@@ -65,9 +97,9 @@ const AppRoutes = () => {
 							component={BottomTabNavigator}
 						/>
 						<Stack.Screen
-							options={{ headerShown: true, title: `${strings('profile.languageSetting')}` }}
-							name="LanguageSetting"
-							component={LanguageSettingScreen}
+							options={{ headerShown: false }}
+							name="NotificationScreen"
+							component={NotificationScreen}
 						/>
 						<Stack.Screen
 							options={{ headerShown: false }}
@@ -121,8 +153,148 @@ const AppRoutes = () => {
 						/>
 						<Stack.Screen
 							options={{ headerShown: false }}
-							name="PageDetailPatroli"
-							component={PageDetailPatroli}
+							name="DialogFormReport"
+							component={DialogFormReport}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="ActivityScreen"
+							component={ActivityScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormDailyReport"
+							component={DialogFormDailyReport}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="ManpowerScreen"
+							component={ManpowerScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="VisitScreen"
+							component={VisitScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="SpesialRequestScreen"
+							component={SpesialRequestScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="TrainingScreen"
+							component={TrainingScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="InformationScreen"
+							component={InformationScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="ShiftScreen"
+							component={ShiftScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormShift"
+							component={DialogFormShift}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="MutationBookScreen"
+							component={MutationBookScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormMutationBook"
+							component={DialogFormMutationBook}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="PersonelScreen"
+							component={PersonelScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="SpesialRequestAcitivityScreen"
+							component={SpesialRequestAcitivityScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormSpesialRequest"
+							component={DialogFormSpesialRequest}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="VisitActivityScreen"
+							component={VisitActivityScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormVisit"
+							component={DialogFormVisit}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="TrainingActivityScreen"
+							component={TrainingActivityScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormTraining"
+							component={DialogFormTraining}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="ActionActivityScreen"
+							component={ActionActivityScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormActivity"
+							component={DialogFormActivity}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="BriefScreen"
+							component={BriefScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormBrief"
+							component={DialogFormBrief}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="InformationDetailScreen"
+							component={InformationDetailScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="PatroliDRScreen"
+							component={PatroliDRScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="RegisterScreen"
+							component={RegisterScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="BKOScreen"
+							component={BKOScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="PPEScreen"
+							component={PPEScreen}
+						/>
+						<Stack.Screen
+							options={{ headerShown: false }}
+							name="DialogFormPPE"
+							component={DialogFormPPE}
 						/>
 					</>
 				</Stack.Navigator>