diff --git a/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java b/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
index a4ccc119..44b649a9 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java
@@ -1,5 +1,6 @@
 package gr.thmmy.mthmmy.editorview;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -20,6 +21,7 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 import android.widget.ScrollView;
+import android.widget.TextView;
 
 import java.util.Objects;
 
@@ -50,6 +52,7 @@ public class EditorView extends LinearLayout {
         init(context, attrs);
     }
 
+    @SuppressLint("SetTextI18n")
     private void init(Context context, AttributeSet attrs) {
         LayoutInflater.from(context).inflate(R.layout.editor_view, this, true);
         setOrientation(VERTICAL);
@@ -142,7 +145,8 @@ public class EditorView extends LinearLayout {
             LinearLayout colorPicker = (LinearLayout) colorPickerScrollview.getChildAt(0);
             popupWindow.setContentView(colorPickerScrollview);
             for (int i = 0; i < colorPicker.getChildCount(); i++) {
-                colorPicker.getChildAt(i).setOnClickListener(v -> {
+                TextView child = (TextView) colorPicker.getChildAt(i);
+                child.setOnClickListener(v -> {
                     boolean hadTextSelection = editText.hasSelection();
                     getText().insert(editText.getSelectionStart(), "[color=" + colors.get(v.getId()) + "]");
                     getText().insert(editText.getSelectionEnd(), "[/color]");
diff --git a/app/src/main/res/layout/editor_view_color_picker.xml b/app/src/main/res/layout/editor_view_color_picker.xml
index 0ac2d71b..b71214e1 100644
--- a/app/src/main/res/layout/editor_view_color_picker.xml
+++ b/app/src/main/res/layout/editor_view_color_picker.xml
@@ -13,71 +13,85 @@
         <TextView
             android:id="@+id/black"
             style="@style/PopupMenuItem.TopItem"
-            android:text="@string/black" />
+            android:text="@string/black"
+            android:textColor="@color/black"/>
 
         <TextView
             android:id="@+id/red"
             style="@style/PopupMenuItem"
-            android:text="@string/red" />
+            android:text="@string/red"
+            android:textColor="@color/red"/>
 
         <TextView
             android:id="@+id/yellow"
             style="@style/PopupMenuItem"
-            android:text="@string/yellow" />
+            android:text="@string/yellow"
+            android:textColor="@color/yellow"/>
 
         <TextView
             android:id="@+id/pink"
             style="@style/PopupMenuItem"
-            android:text="@string/pink" />
+            android:text="@string/pink"
+            android:textColor="@color/pink"/>
 
         <TextView
             android:id="@+id/green"
             style="@style/PopupMenuItem"
-            android:text="@string/green" />
+            android:text="@string/green"
+            android:textColor="@color/green"/>
 
         <TextView
             android:id="@+id/orange"
             style="@style/PopupMenuItem"
-            android:text="@string/orange" />
+            android:text="@string/orange"
+            android:textColor="@color/orange"/>
 
         <TextView
             android:id="@+id/purple"
             style="@style/PopupMenuItem"
-            android:text="@string/purple" />
+            android:text="@string/purple"
+            android:textColor="@color/purple"/>
 
         <TextView
             android:id="@+id/blue"
             style="@style/PopupMenuItem"
-            android:text="@string/blue" />
+            android:text="@string/blue"
+            android:textColor="@color/blue"/>
 
         <TextView
             android:id="@+id/beige"
             style="@style/PopupMenuItem"
-            android:text="@string/beige" />
+            android:text="@string/beige"
+            android:textColor="@color/beige"/>
 
         <TextView
             android:id="@+id/brown"
             style="@style/PopupMenuItem"
-            android:text="@string/brown" />
+            android:text="@string/brown"
+            android:textColor="@color/brown"/>
 
         <TextView
             android:id="@+id/teal"
             style="@style/PopupMenuItem"
-            android:text="@string/teal" />
+            android:text="@string/teal"
+            android:textColor="@color/teal"/>
 
         <TextView
             android:id="@+id/navy"
             style="@style/PopupMenuItem"
-            android:text="@string/navy" />
+            android:text="@string/navy"
+            android:textColor="@color/navy"/>
 
         <TextView
             android:id="@+id/maroon"
             style="@style/PopupMenuItem"
-            android:text="@string/maroon" />
+            android:text="@string/maroon"
+            android:textColor="@color/maroon"/>
 
         <TextView
             android:id="@+id/lime_green"
             style="@style/PopupMenuItem.BottomItem"
-            android:text="@string/lime_green" />
+            android:text="@string/lime_green"
+            android:textColor="@color/lime_green"/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c3bdac7a..f2209027 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,4 +26,25 @@
     <color name="dialog_bg_semi_transparent_dark">#D92B2B2B</color>
     <color name="member_of_the_month">#E91E63</color>
     <color name="topic_post_icon">@color/primary_text</color>
+
+    <color name="red">#FF0000</color>
+    <color name="maroon">#800000</color>
+    <color name="brown">#A52A2A</color>
+    <color name="orange">#FFA500</color>
+    <color name="yellow">#FFFF00</color>
+    <color name="olive">#808000</color>
+    <color name="green">#008000</color>
+    <color name="purple">#800080</color>
+    <color name="fuchsia">#FF00FF</color>
+    <color name="pink">#FFC0CB</color>
+    <color name="beige">#F5F5DC</color>
+    <color name="lime">#00FF00</color>
+    <color name="lime_green">#32CD32</color>
+    <color name="teal">#008080</color>
+    <color name="aqua">#00FFFF</color>
+    <color name="blue">#0000FF</color>
+    <color name="navy">#000080</color>
+    <color name="black">#000000</color>
+    <color name="grey">#808080</color>
+    <color name="silver">#C0C0C0</color>
 </resources>