diff --git a/util/minifyjs.sh b/util/minifyjs.sh
index a2d53da3e7..6341860b13 100755
--- a/util/minifyjs.sh
+++ b/util/minifyjs.sh
@@ -9,7 +9,7 @@ JSFILES=(
 	"js/ajaxupload.js"
 	"js/country.js"
 	"js/main.js"
-	"js/webtoolkit.base64.js"
+	"vendor/asset/base64/base64.min.js"
 	"view/theme/frost/js/acl.js"
 	"view/theme/frost/js/jquery.divgrow-1.3.1.f1.js"
 	"view/theme/frost/js/main.js"
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 559135ba12..c95f2cfa07 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -45,7 +45,7 @@
 <script type="text/javascript" src="library/datetimepicker/jquery.datetimepicker.js"></script>
 <script type="text/javascript" src="library/perfect-scrollbar/perfect-scrollbar.jquery.min.js" ></script>
 <script type="text/javascript" src="js/acl.js" ></script>
-<script type="text/javascript" src="js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
 <script type="text/javascript" src="js/main.js" ></script>
 <script>
 
diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl
index 8645fea674..52e11defd5 100644
--- a/view/templates/oembed_video.tpl
+++ b/view/templates/oembed_video.tpl
@@ -1,4 +1,4 @@
-<a class="embed_video" href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); this.classList.add("active"); return false;'>
+<a class="embed_video" href="{{$embedurl}}" onclick='this.innerHTML=window.atob("{{$escapedhtml}}"); this.classList.add("active"); return false;'>
 	<img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' >
 	<div style='width: {{$tw}}px; height: {{$th}}px;'></div>
 </a>
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 02bf87e33a..a1932b4730 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -69,7 +69,7 @@
 <script type="text/javascript" src="library/datetimepicker/jquery.datetimepicker.js"></script>
 <script type="text/javascript" src="library/perfect-scrollbar/perfect-scrollbar.jquery.min.js" ></script>
 <script type="text/javascript" src="js/acl.js" ></script>
-<script type="text/javascript" src="js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="vendor/asset/base64/base64.min.js" ></script>
 <script type="text/javascript" src="js/main.js" ></script>
 
 <script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>
diff --git a/view/theme/frost-mobile/templates/end.tpl b/view/theme/frost-mobile/templates/end.tpl
index 04416ad00e..a1bc5129b9 100644
--- a/view/theme/frost-mobile/templates/end.tpl
+++ b/view/theme/frost-mobile/templates/end.tpl
@@ -10,7 +10,7 @@
 <script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/acl.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/main.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost-mobile/js/theme.js"></script>
 
diff --git a/view/theme/frost/templates/end.tpl b/view/theme/frost/templates/end.tpl
index b9768ba894..305a132814 100644
--- a/view/theme/frost/templates/end.tpl
+++ b/view/theme/frost/templates/end.tpl
@@ -12,7 +12,7 @@
 <script type="text/javascript" src="{{$baseurl}}/library/datetimepicker/jquery.datetimepicker.js"></script>
 
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/acl.js" ></script>
-<script type="text/javascript" src="{{$baseurl}}/js/webtoolkit.base64.js" ></script>
+<script type="text/javascript" src="{{$baseurl}}/vendor/asset/base64/base64.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/library/jquery-textcomplete/jquery.textcomplete.min.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/js/autocomplete.js" ></script>
 <script type="text/javascript" src="{{$baseurl}}/view/theme/frost/js/main.js" ></script>