diff --git a/api/comments.go b/api/comments.go
index d85ad5a..8e260c7 100644
--- a/api/comments.go
+++ b/api/comments.go
@@ -55,6 +55,9 @@ func ParseComment(data gjson.Result) types.Comment {
 	deletedAt, _ := utils.FormatDate(data.Get("deleted_at").String())
 
 	userAvatar := strings.ReplaceAll(data.Get("account.avatar").String(), "https://i.imgur.com", "")
+	if viper.GetBool("CF_ALL_MEDIA") {
+		userAvatar = viper.GetString("CF_MEDIA_DISTRIBUTION") + userAvatar
+	}
 
 	wg := sync.WaitGroup{}
 	comments := make([]types.Comment, 0)
@@ -85,7 +88,7 @@ func ParseComment(data gjson.Result) types.Comment {
 		Downvotes: data.Get("downvote_count").Int(),
 		Platform:  data.Get("platform").String(),
 		CreatedAt: createdAt,
-		RelTime: 	 humanize.Time(createdTime),
+		RelTime:   humanize.Time(createdTime),
 		UpdatedAt: updatedAt,
 		DeletedAt: deletedAt,
 	}
diff --git a/pages/gallery.go b/pages/gallery.go
index cb0fb98..b8941fd 100644
--- a/pages/gallery.go
+++ b/pages/gallery.go
@@ -9,7 +9,7 @@ import (
 
 func HandleGallery(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'self'; img-src 'self'; font-src 'self'; block-all-mixed-content")
+	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'self'; media-src 'self' *.cloudfront.net; img-src 'self' *.cloudfront.net; font-src 'self'; block-all-mixed-content")
 
 	album, err := api.FetchAlbum(c.Params("galleryID"))
 	if err != nil {
diff --git a/pages/user.go b/pages/user.go
index b6f21de..5b1401a 100644
--- a/pages/user.go
+++ b/pages/user.go
@@ -12,7 +12,7 @@ import (
 func HandleUser(c *fiber.Ctx) error {
 	utils.SetHeaders(c)
 	c.Set("Cache-Control", "public,max-age=604800")
-	c.Set("Content-Security-Policy", "default-src 'none'; media-src 'self'; style-src 'unsafe-inline' 'self'; img-src 'self'; font-src 'self'; block-all-mixed-content")
+	c.Set("Content-Security-Policy", "default-src 'none'; style-src 'self' 'unsafe-inline'; media-src 'self' *.cloudfront.net; img-src 'self' *.cloudfront.net; font-src 'self'; block-all-mixed-content")
 
 	wg := sync.WaitGroup{}
 	wg.Add(2)