diff --git a/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipboardHandler.java b/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipboardHandler.java
index 2656645..7b92454 100644
--- a/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipboardHandler.java
+++ b/app/src/main/java/cfpi_fpsi/eu/titanboard/ClipboardHandler.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 public class ClipboardHandler implements ClipboardManager.OnPrimaryClipChangedListener {
     private final static int MAX_CLIPS = 4;
     private final ArrayList<ClipData> mClips = new ArrayList<>();
-    private ClipboardManager mClipboardManager;
+    private final ClipboardManager mClipboardManager;
 
     public ClipboardHandler(Context ctx) {
         mClipboardManager = (ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE);
diff --git a/app/src/main/res/values/bool.xml b/app/src/main/res/values/bools.xml
similarity index 100%
rename from app/src/main/res/values/bool.xml
rename to app/src/main/res/values/bools.xml
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimen.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/style.xml
rename to app/src/main/res/values/styles.xml