diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index d3b0197..fce092d 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -2,9 +2,6 @@
 
     package="com.joeracosta.library">
 
-    <application android:allowBackup="true" android:label="@string/app_name"
-        android:supportsRtl="true">
-
-    </application>
+    <application/>
 
 </manifest>
diff --git a/library/src/main/java/com/joeracosta/library/activity/FragmentMapActivity.java b/library/src/main/java/com/joeracosta/library/activity/FragmentMapActivity.java
index c5a66df..2f96832 100644
--- a/library/src/main/java/com/joeracosta/library/activity/FragmentMapActivity.java
+++ b/library/src/main/java/com/joeracosta/library/activity/FragmentMapActivity.java
@@ -1,11 +1,11 @@
 package com.joeracosta.library.activity;
 
-import android.arch.lifecycle.LifecycleActivity;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
 
 /**
  * Created by Joe on 8/14/2017.
@@ -14,7 +14,7 @@
  * It will be sent to this activity. You shouldn't inflate a layout here inside the fragment container that is meant to be visible
  * to the user.
  */
-public abstract class FragmentMapActivity extends LifecycleActivity {
+public abstract class FragmentMapActivity extends AppCompatActivity {
 
     private static final String CURRENT_FRAG_TAG = "com.joeracosta.current_frag_tag_activity_map";
 
diff --git a/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.java b/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.java
index 5531994..879f072 100644
--- a/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.java
+++ b/library/src/main/java/com/joeracosta/library/activity/FragmentStackActivity.java
@@ -1,10 +1,10 @@
 package com.joeracosta.library.activity;
 
-import android.arch.lifecycle.LifecycleActivity;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v7.app.AppCompatActivity;
 
 import java.util.Stack;
 
@@ -14,7 +14,7 @@
  * and you press back, instead of being popped, this activity will get the back press. So you shouldn't inflate a layout here inside the fragment container that is meant to be visible
  * to the user. There should always be at least one SimpleFragment in the stack.
  */
-public abstract class FragmentStackActivity extends LifecycleActivity {
+public abstract class FragmentStackActivity extends AppCompatActivity {
 
     private static final String BACKSTAG_FRAG_TAGS = "com.joeracosta.back_stack_frag_tags_activity";