diff --git a/squarenotsquare/components/Game.js b/squarenotsquare/components/Game.js
index 3f2f77d..2153317 100644
--- a/squarenotsquare/components/Game.js
+++ b/squarenotsquare/components/Game.js
@@ -1,38 +1,14 @@
-import React, { Component } from "react";
+import React from "react";
 import { Text, View } from "react-native";
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
+import { useState } from "react";
 
-class Game extends Component {
-    constructor(props){
-        super(props)
-        this.state = {
-    
-        }
+function Game(props){
 
-        //props.someNavAction, 5000
-        //setTimeout(null, 5000);
-    }
-
-    render () {
-        return (
-            <View>
-                <Text>test</Text>
-            </View>
-        );
-    };
-}
-
-function mapStateToProps(){
-
-}
-
-const mapDispatchToProps = (dispatch) => {
-    let actions = {
-        //...someActionsGroup
-    };
-
-    return bindActionCreators(actions, dispatch);
+    return (
+        <View>
+            <Text style={{color: 'black'}}>test</Text>
+        </View>
+    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Game);
\ No newline at end of file
+export default Game;
\ No newline at end of file
diff --git a/squarenotsquare/components/HighScore.js b/squarenotsquare/components/HighScore.js
index 0cceb24..390422a 100644
--- a/squarenotsquare/components/HighScore.js
+++ b/squarenotsquare/components/HighScore.js
@@ -1,38 +1,14 @@
-import React, { Component } from "react";
+import React from "react";
 import { Text, View } from "react-native";
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
+import { useState } from "react";
 
-class HighScore extends Component {
-    constructor(props){
-        super(props)
-        this.state = {
-    
-        }
+function HighScore(props){
 
-        //props.someNavAction, 5000
-        //setTimeout(null, 5000);
-    }
-
-    render () {
-        return (
-            <View>
-                <Text>test</Text>
-            </View>
-        );
-    };
-}
-
-function mapStateToProps(){
-
-}
-
-const mapDispatchToProps = (dispatch) => {
-    let actions = {
-        //...someActionsGroup
-    };
-
-    return bindActionCreators(actions, dispatch);
+    return (
+        <View>
+            <Text style={{color: 'black'}}>test</Text>
+        </View>
+    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(HighScore);
\ No newline at end of file
+export default HighScore;
\ No newline at end of file
diff --git a/squarenotsquare/components/Home.js b/squarenotsquare/components/Home.js
index 32b0376..35ee4e7 100644
--- a/squarenotsquare/components/Home.js
+++ b/squarenotsquare/components/Home.js
@@ -1,38 +1,14 @@
-import React, { Component } from "react";
+import React from "react";
 import { Text, View } from "react-native";
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
+import { useState } from "react";
 
-class Home extends Component {
-    constructor(props){
-        super(props)
-        this.state = {
-    
-        }
+function Home(props){
 
-        //props.someNavAction, 5000
-        //setTimeout(null, 5000);
-    }
-
-    render () {
-        return (
-            <View>
-                <Text>test</Text>
-            </View>
-        );
-    };
-}
-
-function mapStateToProps(){
-
-}
-
-const mapDispatchToProps = (dispatch) => {
-    let actions = {
-        //...someActionsGroup
-    };
-
-    return bindActionCreators(actions, dispatch);
+    return (
+        <View>
+            <Text style={{color: 'black'}}>test</Text>
+        </View>
+    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Home);
\ No newline at end of file
+export default Home;
\ No newline at end of file
diff --git a/squarenotsquare/components/Settings.js b/squarenotsquare/components/Settings.js
index a701cc7..91cfd0a 100644
--- a/squarenotsquare/components/Settings.js
+++ b/squarenotsquare/components/Settings.js
@@ -1,38 +1,14 @@
-import React, { Component } from "react";
+import React from "react";
 import { Text, View } from "react-native";
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
+import { useState } from "react";
 
-class Settings extends Component {
-    constructor(props){
-        super(props)
-        this.state = {
-    
-        }
+function Settings(props){
 
-        //props.someNavAction, 5000
-        //setTimeout(null, 5000);
-    }
-
-    render () {
-        return (
-            <View>
-                <Text>test</Text>
-            </View>
-        );
-    };
-}
-
-function mapStateToProps(){
-
-}
-
-const mapDispatchToProps = (dispatch) => {
-    let actions = {
-        //...someActionsGroup
-    };
-
-    return bindActionCreators(actions, dispatch);
+    return (
+        <View>
+            <Text style={{color: 'black'}}>test</Text>
+        </View>
+    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Settings);
\ No newline at end of file
+export default Settings;
\ No newline at end of file
diff --git a/squarenotsquare/components/Splash.js b/squarenotsquare/components/Splash.js
index f8dddca..5323b79 100644
--- a/squarenotsquare/components/Splash.js
+++ b/squarenotsquare/components/Splash.js
@@ -1,40 +1,14 @@
-import React, { Component } from "react";
+import React from "react";
 import { Text, View } from "react-native";
-import { connect } from "react-redux";
-import { bindActionCreators } from "redux";
+import { useState } from "react";
 
-class Splash extends Component {
-    constructor(props){
-        super(props)
-        this.state = {
-    
-        }
+function Splash(props){
 
-        //props.someNavAction, 5000
-        //setTimeout(null, 5000);
-    }
-
-    render () {
-        return (
-            <View>
-                <Text>test</Text>
-            </View>
-        );
-    };
-}
-
-function mapStateToProps(){
-    return {
-        //system: state.system,
-    }
-}
-
-const mapDispatchToProps = (dispatch) => {
-    let actions = {
-        //...someActionsGroup
-    };
-
-    return bindActionCreators(actions, dispatch);
+    return (
+        <View>
+            <Text style={{color: 'black'}}>test</Text>
+        </View>
+    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(Splash);
\ No newline at end of file
+export default Splash;
\ No newline at end of file
diff --git a/squarenotsquare/navigation/SquareStack.js b/squarenotsquare/navigation/SquareStack.js
index 2616366..9faa84b 100644
--- a/squarenotsquare/navigation/SquareStack.js
+++ b/squarenotsquare/navigation/SquareStack.js
@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React from 'react';
 import {NavigationContainer} from '@react-navigation/native';
 import {createStackNavigator} from '@react-navigation/stack';
 import {connect} from 'react-redux';
@@ -12,52 +12,40 @@ import Splash from '../components/Splash';
 
 const SquareNav = createStackNavigator();
 
-class SquareStack extends Component {
-    render() {
-        let noHeader = {headerShown: false};
+function SquareStack() {
+    let noHeader = {headerShown: false};
 
-        return (
-            <NavigationContainer ref={squareRef}>
-                <SquareNav.Navigator initialRouteName="Splash">
-                    <SquareNav.Screen
-                        name="Splash"
-                        component={Splash}
-                        options={noHeader}
-                    />
-                    <SquareNav.Screen
-                        name="Home"
-                        component={Home}
-                        options={noHeader}
-                    />
-                    <SquareNav.Screen
-                        name="HighScore"
-                        component={HighScore}
-                        options={noHeader}
-                    />
-                    <SquareNav.Screen
-                        name="Settings"
-                        component={Settings}
-                        options={noHeader}
-                    />
-                    <SquareNav.Screen
-                        name="Game"
-                        component={Game}
-                        options={noHeader}
-                    />
-                </SquareNav.Navigator>
-            </NavigationContainer>
-        )
-    }
+    return (
+        <NavigationContainer ref={squareRef}>
+            <SquareNav.Navigator initialRouteName="Splash">
+                <SquareNav.Screen
+                    name="Splash"
+                    component={Splash}
+                    options={noHeader}
+                />
+                <SquareNav.Screen
+                    name="Home"
+                    component={Home}
+                    options={noHeader}
+                />
+                <SquareNav.Screen
+                    name="HighScore"
+                    component={HighScore}
+                    options={noHeader}
+                />
+                <SquareNav.Screen
+                    name="Settings"
+                    component={Settings}
+                    options={noHeader}
+                />
+                <SquareNav.Screen
+                    name="Game"
+                    component={Game}
+                    options={noHeader}
+                />
+            </SquareNav.Navigator>
+        </NavigationContainer>
+    )
 }
 
-function mapStateToProps(state) {
-    return {
-        Navigation: state.Navigation
-    }
-}
-
-function mapDispatchToProps(dispatch) {
-    return {dispatch: dispatch};
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SquareStack)
\ No newline at end of file
+export default SquareStack;
\ No newline at end of file