diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
index ee7042d..6dcf703 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java
@@ -23,7 +23,6 @@ import org.mian.gitnex.adapters.CommitsAdapter;
 import org.mian.gitnex.clients.AppApiService;
 import org.mian.gitnex.helpers.Authorization;
 import org.mian.gitnex.helpers.StaticGlobalVariables;
-import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.Version;
 import org.mian.gitnex.interfaces.ApiInterface;
 import org.mian.gitnex.models.Commits;
@@ -102,7 +101,7 @@ public class CommitsActivity extends BaseActivity {
 		swipeRefresh.setOnRefreshListener(() -> new Handler().postDelayed(() -> {
 
 			swipeRefresh.setRefreshing(false);
-			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName);
+			loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
 			adapter.notifyDataChanged();
 
 		}, 200));
@@ -113,7 +112,7 @@ public class CommitsActivity extends BaseActivity {
 			if(commitsList.size() == resultLimit || pageSize == resultLimit) {
 
 				int page = (commitsList.size() + resultLimit) / resultLimit;
-				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName);
+				loadMore(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, page, branchName, resultLimit);
 
 			}
 
@@ -124,13 +123,13 @@ public class CommitsActivity extends BaseActivity {
 		recyclerView.setAdapter(adapter);
 
 		api = AppApiService.createService(ApiInterface.class, instanceUrl, ctx);
-		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName);
+		loadInitial(Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName, branchName, resultLimit);
 
 	}
 
-	private void loadInitial(String token, String repoOwner, String repoName, String branchName) {
+	private void loadInitial(String token, String repoOwner, String repoName, String branchName, int resultLimit) {
 
-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName);
+		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, 1, branchName, resultLimit);
 
 		call.enqueue(new Callback<List<Commits>>() {
 
@@ -175,13 +174,13 @@ public class CommitsActivity extends BaseActivity {
 
 	}
 
-	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName) {
+	private void loadMore(String token, String repoOwner, String repoName, final int page, String branchName, int resultLimit) {
 
 		//add loading progress view
 		commitsList.add(new Commits("load"));
 		adapter.notifyItemInserted((commitsList.size() - 1));
 
-		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName);
+		Call<List<Commits>> call = api.getRepositoryCommits(token, repoOwner, repoName, page, branchName, resultLimit);
 
 		call.enqueue(new Callback<List<Commits>>() {
 
@@ -204,7 +203,6 @@ public class CommitsActivity extends BaseActivity {
 					}
 					else {
 
-						Toasty.info(ctx, getString(R.string.noMoreData));
 						adapter.setMoreDataAvailable(false);
 
 					}
diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
index 1565fb8..bb9d61b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -165,6 +165,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
+	        holder.fileInfo.setVisibility(View.GONE);
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
         }
         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 0a53b05..6f58ddc 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -109,13 +109,6 @@ public class RepoStargazersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        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 35ca339..ebd8870 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -109,13 +109,6 @@ public class RepoWatchersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        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 083e8fd..9beede2 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@@ -111,12 +111,5 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 1) { //light
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
-        }
-        else { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-
     }
 }
diff --git a/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java b/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
index a10ca15..1a7d41d 100644
--- a/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
+++ b/app/src/main/java/org/mian/gitnex/interfaces/ApiInterface.java
@@ -271,7 +271,7 @@ public interface ApiInterface {
     Call<ResponseBody> mergePullRequest(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body MergePullRequest jsonStr);
 
     @GET("repos/{owner}/{repo}/commits") // get all commits
-    Call<List<Commits>> getRepositoryCommits(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("sha") String branchName);
+    Call<List<Commits>> getRepositoryCommits(@Header("Authorization") String token, @Path("owner") String owner, @Path("repo") String repo, @Query("page") int page, @Query("sha") String branchName, @Query("limit") int limit);
 
     @PATCH("repos/{owner}/{repo}/milestones/{index}") // close / reopen milestone
     Call<JsonElement> closeReopenMilestone(@Header("Authorization") String token, @Path("owner") String ownerName, @Path("repo") String repoName, @Path("index") int index, @Body Milestones jsonStr);
diff --git a/app/src/main/res/layout/list_members_by_team_by_org.xml b/app/src/main/res/layout/list_members_by_team_by_org.xml
index 32ac648..7401417 100644
--- a/app/src/main/res/layout/list_members_by_team_by_org.xml
+++ b/app/src/main/res/layout/list_members_by_team_by_org.xml
@@ -20,6 +20,7 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/orgMember"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_repo_stargazers.xml b/app/src/main/res/layout/list_repo_stargazers.xml
index b82e12d..ac2775e 100644
--- a/app/src/main/res/layout/list_repo_stargazers.xml
+++ b/app/src/main/res/layout/list_repo_stargazers.xml
@@ -20,6 +20,7 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/starMember"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_repo_watchers.xml b/app/src/main/res/layout/list_repo_watchers.xml
index 1c38c5b..3655776 100644
--- a/app/src/main/res/layout/list_repo_watchers.xml
+++ b/app/src/main/res/layout/list_repo_watchers.xml
@@ -20,6 +20,7 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/watcherMember"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>