diff --git a/fancybox/CHANGELOG.md b/fancybox/CHANGELOG.md
index 60edc6357..3d676c0c9 100644
--- a/fancybox/CHANGELOG.md
+++ b/fancybox/CHANGELOG.md
@@ -1,3 +1,13 @@
+### Version 1.03
+
+* imgages in body-attach with title / alt attribute get them removed while adding fancy attributes
+* Added fancybox to image inlined in posts. Un-hooked the old lightbox from frio and vier and excahnged that with fancybox hooks.
+* Excluded images in "type-link" divs from being "fancied" as they have no images but pages linked to. 
+
+### Version 1.02
+
+* [MrPetovan](https://github.com/MrPetovan) optimized my noob regular expression code. 
+
 ### Version 1.01
 
 * One gallery for each post
diff --git a/fancybox/asset/fancybox/fancybox.config.js b/fancybox/asset/fancybox/fancybox.config.js
index 904390d5a..2b9c4f418 100644
--- a/fancybox/asset/fancybox/fancybox.config.js
+++ b/fancybox/asset/fancybox/fancybox.config.js
@@ -1,3 +1,5 @@
 $(document).ready(function() {
     $.fancybox.defaults.loop = "true";
+    // this disables the colorbox hook found in frio/js/modal.js:34
+    $("body").off("click", ".wall-item-body a img");
 });
\ No newline at end of file
diff --git a/fancybox/createrelease b/fancybox/createrelease
index 6760c242e..238828d69 100755
--- a/fancybox/createrelease
+++ b/fancybox/createrelease
@@ -11,7 +11,7 @@ rm $MODULE/dist/*
 # create release for actual version
 zip -r9 $MODULE/dist/release.zip $MODULE/* -x $MODULE/dist/\* -x $MODULE/test/\* $MODULE/createrelease
 
-echo release/release.zip created.
+echo dist/release.zip created.
 
 cd $MODULE
 
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index f3a566a50..43219103b 100644
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -2,7 +2,7 @@
 /**
  * Name: Fancybox
  * Description: Open media attachments of posts into a fancybox overlay.
- * Version: 1.01
+ * Version: 1.03
  * Author: Grischa Brockhaus <grischa@brockha.us>
  */
 
@@ -28,27 +28,33 @@ function fancybox_footer(App $a, string &$str)
 	DI::page()->registerFooterScript(__DIR__ . '/asset/fancybox/fancybox.config.js');
 }
 
-function fancybox_render(App $a, array &$b)
-{
-	$matches = [];
-	$pattern = '#<div class="body-attach">.*?</div>#s';
-	$gallery = 'gallery';
-	if (array_key_exists('item', $b)) {
-		$item = $b['item'];
-		if (array_key_exists('uri-id', $item)) {
-			$gallery = $gallery . '-' . $item['uri-id'];
+function fancybox_render(App $a, array &$b){
+	$gallery = 'gallery-' . $b['item']['uri-id'] ?? random_int(1000000, 10000000);
+
+	// performWithEscapedBlocks escapes block defined with 2nd par pattern that won't be processed.
+	// We don't want to touch images in class="type-link":
+	$b['html'] = \Friendica\Util\Strings::performWithEscapedBlocks(
+		$b['html'],
+		'#<div class="type-link">.*?</div>#s',
+		function ($text) use ($gallery) {
+			// This processes images inlined in posts
+			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
+			//if (!in_array($a->getCurrentTheme(),['vier','frio']))
+			$text = preg_replace(
+				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
+				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
+				$text);
+
+			// Local content images attached:
+			$text = preg_replace_callback(
+				'#<div class="body-attach">.*?</div>#s',
+				function ($matches) use ($gallery) {
+					return str_replace('<a href', '<a data-fancybox="' . $gallery . '" href', $matches[0]);
+				},
+				$text
+			);
+
+			return $text;
 		}
-	}
-	$html = $b['html'];
-	while (preg_match($pattern, $html, $matches, PREG_OFFSET_CAPTURE)) {
-		if (is_array($matches)) {
-			$matches = $matches[0];
-		}
-		$part     = $matches[0];
-		$replaced = str_replace('<a href', '<a data-fancybox="' . $gallery . '" href', $part);
-		$replaced = str_replace('<div class="body-attach"', '<div class="body-attach done"', $replaced);
-		$html     = str_replace($part, $replaced, $html);
-	}
-	$html      = str_replace('class="body-attach done"', 'class="body-attach"', $html);
-	$b['html'] = $html;
+	);
 }