diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 5bac3d2cd..0751f838b 100644
--- a/client/loclass/fileutils.c
+++ b/client/loclass/fileutils.c
@@ -71,14 +71,14 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
 	/*Opening file for writing in binary mode*/
 	FILE *f = fopen(fileName, "wb");
 	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		free(fileName);
 		return 1;
 	}
 	fwrite(data, 1,	datalen, f);
 	fflush(f);
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file %s", datalen, fileName);
+	PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file " _YELLOW_(%s), datalen, fileName);
 	free(fileName);
 	return 0;
 }
@@ -106,8 +106,8 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 
 	/*Opening file for writing in text mode*/
 	FILE *f = fopen(fileName, "w+");
-	if (!f) {
-		PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
+	if (!f) {		
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval =  1;
 		goto out;
 	}
@@ -130,7 +130,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
 	}
 	fflush(f);
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file %s", blocks, fileName);
+	PrintAndLogDevice(SUCCESS, "saved %d blocks to text file " _YELLOW_(%s), blocks, fileName);
 	
 out:	
 	free(fileName);
@@ -240,13 +240,12 @@ int saveFileJSON(const char *preferredName, const char *suffix, JSONFileType fty
 
 	int res = json_dump_file(root, fileName, JSON_INDENT(2));
 	if (res) {
-		PrintAndLogDevice(FAILED, "error: can't save the file: %s", fileName);
+		PrintAndLogDevice(FAILED, "error: can't save the file: " _YELLOW_(%s), fileName);
 		json_decref(root);
 		retval = 200;
 		goto out;
 	}
-	PrintAndLogDevice(SUCCESS, "File `%s` saved.", fileName);
-	
+	PrintAndLogDevice(SUCCESS, "File `" _YELLOW_(%s)"` saved.", fileName);
 	json_decref(root);
 
 out:	
@@ -266,7 +265,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 
 	FILE *f = fopen(fileName, "rb");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -305,7 +304,7 @@ int loadFile(const char *preferredName, const char *suffix, void* data, size_t*
 	memcpy( (data), dump, bytes_read);
 	free(dump);
 	
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file %s", bytes_read, fileName);
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from binary file " _YELLOW_(%s), bytes_read, fileName);
 	
 	*datalen = bytes_read;
 
@@ -328,7 +327,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 
 	FILE *f = fopen(fileName, "r");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -359,7 +358,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
 		}
 	}
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file %s", counter, fileName);
+	PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
 	*datalen = counter;
 		
 out:	
@@ -382,13 +381,13 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 
 	root = json_load_file(fileName, 0, &error);
 	if (!root) {
-		PrintAndLog("ERROR: json (%s) error on line %d: %s", fileName, error.line, error.text);
+		PrintAndLog("ERROR: json " _YELLOW_(%s) " error on line %d: %s", fileName, error.line, error.text);
 		retval = 2; 
 		goto out;
 	}
 	
 	if (!json_is_object(root)) {
-		PrintAndLog("ERROR: Invalid json (%s) format. root must be an object.", fileName);
+		PrintAndLog("ERROR: Invalid json " _YELLOW_(%s) " format. root must be an object.", fileName);
 		retval = 3; 
 		goto out;
 	}
@@ -446,7 +445,7 @@ int loadFileJSON(const char *preferredName, const char *suffix, void* data, size
 	}
 
 	
-	PrintAndLog("Loaded JSON: (%s) OK.", fileName);
+	PrintAndLog("Loaded JSON: " _YELLOW_(%s) " OK.", fileName);
 out:	
 	json_decref(root);
 	free(fileName);
@@ -479,7 +478,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 
 	FILE *f = fopen(fileName, "r");
 	if ( !f ) {
-		PrintAndLogDevice(FAILED, "file: %s: not found or locked.", fileName);
+		PrintAndLogDevice(WARNING, "file not found or locked. '" _YELLOW_(%s)"'", fileName);
 		retval = 1;
 		goto out;
 	}
@@ -512,7 +511,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
 		counter += (keylen >> 1);
 	}
 	fclose(f);
-	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file %s", *keycnt, fileName);	
+	PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);	
 	*datalen = counter;	
 out:	
 	free(fileName);