diff --git a/wwwroot/notgallery.php b/wwwroot/notgallery.php
index c667a38..5e8185d 100644
--- a/wwwroot/notgallery.php
+++ b/wwwroot/notgallery.php
@@ -16,7 +16,7 @@ function the($Thing)
 		$Path = pathinfo($Thing);
 		$Extension = $Path['extension'];
 
-		if(preg_match('{jpe?g|gif|png}i', $Extension))
+		if(preg_match('{jpe?g|gif|png|webp}i', $Extension))
 			return 'Image';
 	}
 
@@ -62,9 +62,11 @@ function ResizeImage($Filename, $Thumbnail, $Size)
 		case "image/jpeg":
 			$Image = @ImageCreateFromJpeg($Filename);
 			break;
+		case "image/webp":
+			$Image = @ImageCreateFromWebp($Filename);
 	}
 
-	if($ImageData[2] == IMAGETYPE_GIF or $ImageData[2]  == IMAGETYPE_PNG)
+	if($ImageData[2] == IMAGETYPE_GIF or $ImageData[2]  == IMAGETYPE_PNG or $ImageData[2] == IMAGETYPE_WEBP)
 	{
 		$TransIndex = imagecolortransparent($Image);
 
@@ -85,7 +87,7 @@ function ResizeImage($Filename, $Thumbnail, $Size)
 
 		}
 		// Always make a transparent background color for PNGs that don't have one allocated already
-		elseif ($ImageData[2] == IMAGETYPE_PNG)
+		elseif ($ImageData[2] == IMAGETYPE_PNG or $ImageData[2] == IMAGETYPE_WEBP)
 		{
 
 			// Turn off transparency blending (temporarily)
@@ -111,6 +113,9 @@ function ResizeImage($Filename, $Thumbnail, $Size)
 		case "image/png":
 			@ImagePng($NewImage, $Thumbnail);
 			break;
+		case "image/webp":
+			@ImageWebp($NewImage, $Thumbnail);
+			break;
 		case "image/jpeg":
 			@ImageJpeg($NewImage, $Thumbnail);
 			break;
diff --git a/wwwroot/src/markup/edit.php b/wwwroot/src/markup/edit.php
index f6c9934..c35be7e 100644
--- a/wwwroot/src/markup/edit.php
+++ b/wwwroot/src/markup/edit.php
@@ -108,12 +108,18 @@ function edit_replacements($tag, $content)
                     case "image/png":
                         $Extension = "png";
                         break;
+                    case "image/webp":
+                        $Extension = "webp";
+                        break;
                     case "video/webm":
                         $Extension = "webm";
                         break;
                     case "video/mp4":
                         $Extension = "mp4";
                         break;
+                    case "video/quicktime";
+                        $Extension = "mov";
+                        break;
                     case "video/ogg":
                         $Extension = "ogv";
                         break;
@@ -121,7 +127,7 @@ function edit_replacements($tag, $content)
                         $Extension = "svg";
                         break;
                     default:
-                        return "$Mime: Unsupported format! Please use: jpg, gif, png, webm, gifv, mp4, or ogv";
+                        return "$Mime: Unsupported format! Please use: jpg, gif, png, webp, webm, gifv, mp4, mov, or ogv";
                 }
 
                 while(file_exists("upload/$Filename.$Extension"))
diff --git a/wwwroot/src/markup/view.php b/wwwroot/src/markup/view.php
index dcb1800..c41d807 100644
--- a/wwwroot/src/markup/view.php
+++ b/wwwroot/src/markup/view.php
@@ -261,7 +261,7 @@ function view_replacements($tag, $content)
                 $path = pathinfo($Link);
 
                 // If a video extension was used
-                if(preg_match('/^(webm|mp4|ogv)$/i', $path['extension']))
+                if(preg_match('/^(webm|mp4|ogv|mov)$/i', $path['extension']))
                 {
                     // Output a special html5 player that behaves like a gif
                     $options = array
diff --git a/wwwroot/upload.php b/wwwroot/upload.php
index 4ec359c..f095c7e 100644
--- a/wwwroot/upload.php
+++ b/wwwroot/upload.php
@@ -26,6 +26,7 @@ function uuid($prefix = '')
     else
     {
         $Mime = mime_content_type($Image['tmp_name']);
+        error_log($Mime);
         switch($Mime){
             case "image/jpg":
                 $Extension = "jpg";
@@ -39,6 +40,9 @@ function uuid($prefix = '')
             case "image/png":
                 $Extension = "png";
                 break;
+            case "image/webp":
+                $Extension = "webp";
+                break;
             case "audio/mpeg":
             case "audio/mp3":
                 $Extension = "mp3";
@@ -50,6 +54,9 @@ function uuid($prefix = '')
             case "video/mp4":
                 $Extension = "mp4";
                 break;
+            case "video/quicktime":
+                $Extension = "mov";
+                break;
             case "audio/midi":
             case "audio/xmidi":
                 $Extension = "mid";