diff --git a/include/effects/Bars.h b/include/effects/Bars.h
index 515d2f11..43a77a2f 100644
--- a/include/effects/Bars.h
+++ b/include/effects/Bars.h
@@ -41,8 +41,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -91,14 +89,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Blur.h b/include/effects/Blur.h
index 6d48c172..167e9303 100644
--- a/include/effects/Blur.h
+++ b/include/effects/Blur.h
@@ -49,8 +49,6 @@
 #include "../QtImageReader.h"
 #include "../ChunkReader.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -104,14 +102,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Brightness.h b/include/effects/Brightness.h
index eb33d338..2a6ab912 100644
--- a/include/effects/Brightness.h
+++ b/include/effects/Brightness.h
@@ -48,8 +48,6 @@
 #include "../QtImageReader.h"
 #include "../ChunkReader.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -91,14 +89,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/ChromaKey.h b/include/effects/ChromaKey.h
index 4440302b..d0fa31d8 100644
--- a/include/effects/ChromaKey.h
+++ b/include/effects/ChromaKey.h
@@ -43,8 +43,6 @@
 #include "../Exceptions.h"
 #include "../KeyFrame.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -88,13 +86,13 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		// Get all properties for a specific frame
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/ColorShift.h b/include/effects/ColorShift.h
index 44c7269b..e9c11d68 100644
--- a/include/effects/ColorShift.h
+++ b/include/effects/ColorShift.h
@@ -40,8 +40,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -95,14 +93,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Crop.h b/include/effects/Crop.h
index 93b54e31..34cea89f 100644
--- a/include/effects/Crop.h
+++ b/include/effects/Crop.h
@@ -41,8 +41,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -90,14 +88,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Deinterlace.h b/include/effects/Deinterlace.h
index 1559a09e..b411b023 100644
--- a/include/effects/Deinterlace.h
+++ b/include/effects/Deinterlace.h
@@ -44,8 +44,6 @@
 #include "../Json.h"
 #include "../KeyFrame.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -84,13 +82,13 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		// Get all properties for a specific frame
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Hue.h b/include/effects/Hue.h
index e6652391..4670b6bf 100644
--- a/include/effects/Hue.h
+++ b/include/effects/Hue.h
@@ -40,8 +40,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -81,14 +79,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Mask.h b/include/effects/Mask.h
index de48219c..dba3b2d8 100644
--- a/include/effects/Mask.h
+++ b/include/effects/Mask.h
@@ -52,8 +52,6 @@
 	#include "../ImageReader.h"
 #endif
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -103,14 +101,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 
 		/// Get the reader object of the mask grayscale image
 		ReaderBase* Reader() { return reader; };
diff --git a/include/effects/Negate.h b/include/effects/Negate.h
index f2437fee..3cbc7988 100644
--- a/include/effects/Negate.h
+++ b/include/effects/Negate.h
@@ -43,8 +43,6 @@
 #include "../Exceptions.h"
 #include "../KeyFrame.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -72,13 +70,13 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		// Get all properties for a specific frame
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Pixelate.h b/include/effects/Pixelate.h
index 06509894..3146d456 100644
--- a/include/effects/Pixelate.h
+++ b/include/effects/Pixelate.h
@@ -41,8 +41,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -90,14 +88,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Saturation.h b/include/effects/Saturation.h
index a24d01ee..de3cc771 100644
--- a/include/effects/Saturation.h
+++ b/include/effects/Saturation.h
@@ -48,8 +48,6 @@
 #include "../QtImageReader.h"
 #include "../ChunkReader.h"
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -88,14 +86,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Shift.h b/include/effects/Shift.h
index db974ae2..243e442e 100644
--- a/include/effects/Shift.h
+++ b/include/effects/Shift.h
@@ -40,8 +40,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -84,14 +82,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/include/effects/Wave.h b/include/effects/Wave.h
index 022173ea..62b08d1f 100644
--- a/include/effects/Wave.h
+++ b/include/effects/Wave.h
@@ -40,8 +40,6 @@
 #include "../KeyFrame.h"
 
 
-using namespace std;
-
 namespace openshot
 {
 
@@ -90,14 +88,14 @@ namespace openshot
 		std::shared_ptr<Frame> GetFrame(std::shared_ptr<Frame> frame, int64_t frame_number);
 
 		/// Get and Set JSON methods
-		string Json(); ///< Generate JSON string of this object
-		void SetJson(string value); ///< Load JSON string into this object
+		std::string Json(); ///< Generate JSON string of this object
+		void SetJson(std::string value); ///< Load JSON string into this object
 		Json::Value JsonValue(); ///< Generate Json::JsonValue for this object
 		void SetJsonValue(Json::Value root); ///< Load Json::JsonValue into this object
 
 		/// Get all properties for a specific frame (perfect for a UI to display the current state
 		/// of all properties at any time)
-		string PropertiesJSON(int64_t requested_frame);
+		std::string PropertiesJSON(int64_t requested_frame);
 	};
 
 }
diff --git a/src/effects/Bars.cpp b/src/effects/Bars.cpp
index 6d731d9c..544160c9 100644
--- a/src/effects/Bars.cpp
+++ b/src/effects/Bars.cpp
@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Bars::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
 }
 
 // Generate JSON string of this object
-string Bars::Json() {
+std::string Bars::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -137,14 +137,14 @@ Json::Value Bars::JsonValue() {
 }
 
 // Load JSON string into this object
-void Bars::SetJson(string value) {
+void Bars::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -185,7 +185,7 @@ void Bars::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Bars::PropertiesJSON(int64_t requested_frame) {
+std::string Bars::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Blur.cpp b/src/effects/Blur.cpp
index 7946e249..8bfdad11 100644
--- a/src/effects/Blur.cpp
+++ b/src/effects/Blur.cpp
@@ -252,7 +252,7 @@ void Blur::boxBlurT(unsigned char *scl, unsigned char *tcl, int w, int h, int r)
 }
 
 // Generate JSON string of this object
-string Blur::Json() {
+std::string Blur::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -274,14 +274,14 @@ Json::Value Blur::JsonValue() {
 }
 
 // Load JSON string into this object
-void Blur::SetJson(string value) {
+void Blur::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -320,7 +320,7 @@ void Blur::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Blur::PropertiesJSON(int64_t requested_frame) {
+std::string Blur::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Brightness.cpp b/src/effects/Brightness.cpp
index 3a1a4bdb..b25727b7 100644
--- a/src/effects/Brightness.cpp
+++ b/src/effects/Brightness.cpp
@@ -108,7 +108,7 @@ std::shared_ptr<Frame> Brightness::GetFrame(std::shared_ptr<Frame> frame, int64_
 }
 
 // Generate JSON string of this object
-string Brightness::Json() {
+std::string Brightness::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -128,14 +128,14 @@ Json::Value Brightness::JsonValue() {
 }
 
 // Load JSON string into this object
-void Brightness::SetJson(string value) {
+void Brightness::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -170,7 +170,7 @@ void Brightness::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Brightness::PropertiesJSON(int64_t requested_frame) {
+std::string Brightness::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/ChromaKey.cpp b/src/effects/ChromaKey.cpp
index 2e2dc511..d06ce739 100644
--- a/src/effects/ChromaKey.cpp
+++ b/src/effects/ChromaKey.cpp
@@ -101,7 +101,7 @@ std::shared_ptr<Frame> ChromaKey::GetFrame(std::shared_ptr<Frame> frame, int64_t
 }
 
 // Generate JSON string of this object
-string ChromaKey::Json() {
+std::string ChromaKey::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -121,14 +121,14 @@ Json::Value ChromaKey::JsonValue() {
 }
 
 // Load JSON string into this object
-void ChromaKey::SetJson(string value) {
+void ChromaKey::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -163,7 +163,7 @@ void ChromaKey::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string ChromaKey::PropertiesJSON(int64_t requested_frame) {
+std::string ChromaKey::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/ColorShift.cpp b/src/effects/ColorShift.cpp
index 10f22217..94d53d22 100644
--- a/src/effects/ColorShift.cpp
+++ b/src/effects/ColorShift.cpp
@@ -194,7 +194,7 @@ std::shared_ptr<Frame> ColorShift::GetFrame(std::shared_ptr<Frame> frame, int64_
 }
 
 // Generate JSON string of this object
-string ColorShift::Json() {
+std::string ColorShift::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -220,14 +220,14 @@ Json::Value ColorShift::JsonValue() {
 }
 
 // Load JSON string into this object
-void ColorShift::SetJson(string value) {
+void ColorShift::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -274,7 +274,7 @@ void ColorShift::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string ColorShift::PropertiesJSON(int64_t requested_frame) {
+std::string ColorShift::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Crop.cpp b/src/effects/Crop.cpp
index 7ff6ec0b..aa35f05f 100644
--- a/src/effects/Crop.cpp
+++ b/src/effects/Crop.cpp
@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Crop::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
 }
 
 // Generate JSON string of this object
-string Crop::Json() {
+std::string Crop::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -136,14 +136,14 @@ Json::Value Crop::JsonValue() {
 }
 
 // Load JSON string into this object
-void Crop::SetJson(string value) {
+void Crop::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
 	                 value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -182,7 +182,7 @@ void Crop::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Crop::PropertiesJSON(int64_t requested_frame) {
+std::string Crop::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Deinterlace.cpp b/src/effects/Deinterlace.cpp
index 65f00ff6..b7a88e0b 100644
--- a/src/effects/Deinterlace.cpp
+++ b/src/effects/Deinterlace.cpp
@@ -96,7 +96,7 @@ std::shared_ptr<Frame> Deinterlace::GetFrame(std::shared_ptr<Frame> frame, int64
 }
 
 // Generate JSON string of this object
-string Deinterlace::Json() {
+std::string Deinterlace::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -115,14 +115,14 @@ Json::Value Deinterlace::JsonValue() {
 }
 
 // Load JSON string into this object
-void Deinterlace::SetJson(string value) {
+void Deinterlace::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -155,7 +155,7 @@ void Deinterlace::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Deinterlace::PropertiesJSON(int64_t requested_frame) {
+std::string Deinterlace::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Hue.cpp b/src/effects/Hue.cpp
index fd33272d..7a581616 100644
--- a/src/effects/Hue.cpp
+++ b/src/effects/Hue.cpp
@@ -103,7 +103,7 @@ std::shared_ptr<Frame> Hue::GetFrame(std::shared_ptr<Frame> frame, int64_t frame
 }
 
 // Generate JSON string of this object
-string Hue::Json() {
+std::string Hue::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -122,14 +122,14 @@ Json::Value Hue::JsonValue() {
 }
 
 // Load JSON string into this object
-void Hue::SetJson(string value) {
+void Hue::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -162,7 +162,7 @@ void Hue::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Hue::PropertiesJSON(int64_t requested_frame) {
+std::string Hue::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Mask.cpp b/src/effects/Mask.cpp
index 9f19475d..3749e14f 100644
--- a/src/effects/Mask.cpp
+++ b/src/effects/Mask.cpp
@@ -150,7 +150,7 @@ std::shared_ptr<Frame> Mask::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
 }
 
 // Generate JSON string of this object
-string Mask::Json() {
+std::string Mask::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -175,14 +175,14 @@ Json::Value Mask::JsonValue() {
 }
 
 // Load JSON string into this object
-void Mask::SetJson(string value) {
+void Mask::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -234,7 +234,7 @@ void Mask::SetJsonValue(Json::Value root) {
 				}
 
 				// Create new reader (and load properties)
-				string type = root["reader"]["type"].asString();
+				std::string type = root["reader"]["type"].asString();
 
 				if (type == "FFmpegReader") {
 
@@ -271,7 +271,7 @@ void Mask::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Mask::PropertiesJSON(int64_t requested_frame) {
+std::string Mask::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Negate.cpp b/src/effects/Negate.cpp
index 938030bc..690cd19e 100644
--- a/src/effects/Negate.cpp
+++ b/src/effects/Negate.cpp
@@ -58,7 +58,7 @@ std::shared_ptr<Frame> Negate::GetFrame(std::shared_ptr<Frame> frame, int64_t fr
 }
 
 // Generate JSON string of this object
-string Negate::Json() {
+std::string Negate::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -76,14 +76,14 @@ Json::Value Negate::JsonValue() {
 }
 
 // Load JSON string into this object
-void Negate::SetJson(string value) {
+void Negate::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -113,7 +113,7 @@ void Negate::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Negate::PropertiesJSON(int64_t requested_frame) {
+std::string Negate::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Pixelate.cpp b/src/effects/Pixelate.cpp
index d7c3fa12..f61e4686 100644
--- a/src/effects/Pixelate.cpp
+++ b/src/effects/Pixelate.cpp
@@ -68,7 +68,7 @@ std::shared_ptr<Frame> Pixelate::GetFrame(std::shared_ptr<Frame> frame, int64_t
 	std::shared_ptr<QImage> frame_image = frame->GetImage();
 
 	// Get current keyframe values
-	double pixelization_value = 1.0 - min(fabs(pixelization.GetValue(frame_number)), 1.0);
+	double pixelization_value = 1.0 - std::min(fabs(pixelization.GetValue(frame_number)), 1.0);
 	double left_value = left.GetValue(frame_number);
 	double top_value = top.GetValue(frame_number);
 	double right_value = right.GetValue(frame_number);
@@ -76,7 +76,7 @@ std::shared_ptr<Frame> Pixelate::GetFrame(std::shared_ptr<Frame> frame, int64_t
 
 	if (pixelization_value > 0.0) {
 		// Resize frame image smaller (based on pixelization value)
-		std::shared_ptr<QImage> smaller_frame_image = std::shared_ptr<QImage>(new QImage(frame_image->scaledToWidth(max(frame_image->width() * pixelization_value, 2.0), Qt::SmoothTransformation)));
+		std::shared_ptr<QImage> smaller_frame_image = std::shared_ptr<QImage>(new QImage(frame_image->scaledToWidth(std::max(frame_image->width() * pixelization_value, 2.0), Qt::SmoothTransformation)));
 
 		// Resize image back to original size (with no smoothing to create pixelated image)
 		std::shared_ptr<QImage> pixelated_image = std::shared_ptr<QImage>(new QImage(smaller_frame_image->scaledToWidth(frame_image->width(), Qt::FastTransformation).convertToFormat(QImage::Format_RGBA8888)));
@@ -110,7 +110,7 @@ std::shared_ptr<Frame> Pixelate::GetFrame(std::shared_ptr<Frame> frame, int64_t
 }
 
 // Generate JSON string of this object
-string Pixelate::Json() {
+std::string Pixelate::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -133,14 +133,14 @@ Json::Value Pixelate::JsonValue() {
 }
 
 // Load JSON string into this object
-void Pixelate::SetJson(string value) {
+void Pixelate::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -181,7 +181,7 @@ void Pixelate::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Pixelate::PropertiesJSON(int64_t requested_frame) {
+std::string Pixelate::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Saturation.cpp b/src/effects/Saturation.cpp
index 98818127..9c941b76 100644
--- a/src/effects/Saturation.cpp
+++ b/src/effects/Saturation.cpp
@@ -114,7 +114,7 @@ std::shared_ptr<Frame> Saturation::GetFrame(std::shared_ptr<Frame> frame, int64_
 }
 
 // Generate JSON string of this object
-string Saturation::Json() {
+std::string Saturation::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -133,14 +133,14 @@ Json::Value Saturation::JsonValue() {
 }
 
 // Load JSON string into this object
-void Saturation::SetJson(string value) {
+void Saturation::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -173,7 +173,7 @@ void Saturation::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Saturation::PropertiesJSON(int64_t requested_frame) {
+std::string Saturation::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Shift.cpp b/src/effects/Shift.cpp
index c22844e7..a204157a 100644
--- a/src/effects/Shift.cpp
+++ b/src/effects/Shift.cpp
@@ -133,7 +133,7 @@ std::shared_ptr<Frame> Shift::GetFrame(std::shared_ptr<Frame> frame, int64_t fra
 }
 
 // Generate JSON string of this object
-string Shift::Json() {
+std::string Shift::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -153,14 +153,14 @@ Json::Value Shift::JsonValue() {
 }
 
 // Load JSON string into this object
-void Shift::SetJson(string value) {
+void Shift::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -195,7 +195,7 @@ void Shift::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Shift::PropertiesJSON(int64_t requested_frame) {
+std::string Shift::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;
diff --git a/src/effects/Wave.cpp b/src/effects/Wave.cpp
index 6e3bd48a..d6aa61b5 100644
--- a/src/effects/Wave.cpp
+++ b/src/effects/Wave.cpp
@@ -113,7 +113,7 @@ std::shared_ptr<Frame> Wave::GetFrame(std::shared_ptr<Frame> frame, int64_t fram
 }
 
 // Generate JSON string of this object
-string Wave::Json() {
+std::string Wave::Json() {
 
 	// Return formatted string
 	return JsonValue().toStyledString();
@@ -136,14 +136,14 @@ Json::Value Wave::JsonValue() {
 }
 
 // Load JSON string into this object
-void Wave::SetJson(string value) {
+void Wave::SetJson(std::string value) {
 
 	// Parse JSON string into JSON objects
 	Json::Value root;
 	Json::CharReaderBuilder rbuilder;
 	Json::CharReader* reader(rbuilder.newCharReader());
 
-	string errors;
+	std::string errors;
 	bool success = reader->parse( value.c_str(),
                  value.c_str() + value.size(), &root, &errors );
 	delete reader;
@@ -184,7 +184,7 @@ void Wave::SetJsonValue(Json::Value root) {
 }
 
 // Get all properties for a specific frame
-string Wave::PropertiesJSON(int64_t requested_frame) {
+std::string Wave::PropertiesJSON(int64_t requested_frame) {
 
 	// Generate JSON properties list
 	Json::Value root;