diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 77138600..cd6fb798 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -17,10 +17,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        if(tinyDb.getInt("themeId") == 0) {
-            setTheme(R.style.AppTheme);
-        }
-        else if(tinyDb.getInt("themeId") == 1) {
+        if(tinyDb.getInt("themeId") == 1) {
             setTheme(R.style.AppThemeLight);
         }
         else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
index 6eb3c1cc..afa1fe26 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -114,13 +114,10 @@ public class RepoStargazersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
index 92a5515f..7d74514f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -114,13 +114,10 @@ public class RepoWatchersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
index 7efbbabf..0aac76c4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@@ -115,13 +115,10 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }