diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index d81092382..e8dd45c45 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -2841,7 +2841,7 @@ class Context
 			list($width, $height) = getimagesize(\RX_BASEDIR . $filename);
 		}
 		self::$_instance->meta_images[] = array(
-			'filepath' => $filename . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $filename)),
+			'filepath' => $filename . '?t=' . filemtime(\RX_BASEDIR . $filename),
 			'width' => $width,
 			'height' => $height,
 		);
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index bc7531534..4703e6322 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -246,7 +246,7 @@ class DisplayHandler extends Handler
 				{
 					case 'HTML':
 						$json_options = defined('JSON_PRETTY_PRINT') ? (JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : 0;
-						$panel_script = sprintf('<script src="%s%s?%s"></script>', RX_BASEURL, 'common/js/debug.js', filemtime(RX_BASEDIR . 'common/js/debug.js'));
+						$panel_script = sprintf('<script src="%s%s?t=%d"></script>', RX_BASEURL, 'common/js/debug.js', filemtime(RX_BASEDIR . 'common/js/debug.js'));
 						$panel_script .= "\n<script>\nvar rhymix_debug_content = " . json_encode($data, $json_options) . ";\n</script>";
 						$body_end_position = strrpos($output, '</body>') ?: strlen($output);
 						$output = substr($output, 0, $body_end_position) . "\n$panel_script\n" . substr($output, $body_end_position);
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
index 2e40e4035..4789a60f7 100644
--- a/classes/frontendfile/FrontEndFileHandler.class.php
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -466,7 +466,7 @@ class FrontEndFileHandler extends Handler
 					$url = $file->filePath . '/' . $file->fileName;
 					if (!$file->isExternalURL && is_readable($file->fileFullPath))
 					{
-						$url .= '?' . date('YmdHis', filemtime($file->fileFullPath));
+						$url .= '?t=' . filemtime($file->fileFullPath);
 					}
 					$result[] = array('file' => $url, 'media' => $file->media);
 				}
@@ -486,7 +486,7 @@ class FrontEndFileHandler extends Handler
 						$concat_content = '@charset "UTF-8";' . "\n\n" . preg_replace('/@charset\s*[\'"][a-z0-9-]+[\'"];\s*/i', '', $concat_content);
 						Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, $concat_content);
 					}
-					$concat_filename .= '?' . date('YmdHis', filemtime(\RX_BASEDIR . $concat_filename));
+					$concat_filename .= '?t=' . filemtime(\RX_BASEDIR . $concat_filename);
 					$result[] = array('file' => \RX_BASEURL . $concat_filename, 'media' => 'all');
 				}
 			}
@@ -500,7 +500,7 @@ class FrontEndFileHandler extends Handler
 					$url = $file->filePath . '/' . $file->fileName;
 					if (!$file->isExternalURL && is_readable($file->fileFullPath))
 					{
-						$url .= '?' . date('YmdHis', filemtime($file->fileFullPath));
+						$url .= '?t=' . filemtime($file->fileFullPath);
 					}
 					$result[] = array('file' => $url, 'media' => $file->media);
 				}
@@ -572,7 +572,7 @@ class FrontEndFileHandler extends Handler
 					$url = $file->filePath . '/' . $file->fileName;
 					if (!$file->isExternalURL && is_readable($file->fileFullPath))
 					{
-						$url .= '?' . date('YmdHis', filemtime($file->fileFullPath));
+						$url .= '?t=' . filemtime($file->fileFullPath);
 					}
 					$result[] = array('file' => $url);
 				}
@@ -590,7 +590,7 @@ class FrontEndFileHandler extends Handler
 					{
 						Rhymix\Framework\Storage::write(\RX_BASEDIR . $concat_filename, Rhymix\Framework\Formatter::concatJS($concat_files, $concat_filename));
 					}
-					$concat_filename .= '?' . date('YmdHis', filemtime(\RX_BASEDIR . $concat_filename));
+					$concat_filename .= '?t=' . filemtime(\RX_BASEDIR . $concat_filename);
 					$result[] = array('file' => \RX_BASEURL . $concat_filename);
 				}
 			}
@@ -604,7 +604,7 @@ class FrontEndFileHandler extends Handler
 					$url = $file->filePath . '/' . $file->fileName;
 					if (!$file->isExternalURL && is_readable($file->fileFullPath))
 					{
-						$url .= '?' . date('YmdHis', filemtime($file->fileFullPath));
+						$url .= '?t=' . filemtime($file->fileFullPath);
 					}
 					$result[] = array('file' => $url);
 				}
diff --git a/modules/admin/models/Icon.php b/modules/admin/models/Icon.php
index 4c5c6fbd4..03dc76c52 100644
--- a/modules/admin/models/Icon.php
+++ b/modules/admin/models/Icon.php
@@ -40,7 +40,7 @@ class Icon
 		$filename = 'files/attach/xeicon/' . ($domain_srl ? ($domain_srl . '/') : '') . $icon_name;
 		if (Storage::exists(\RX_BASEDIR . $filename))
 		{
-			return \RX_BASEURL . $filename . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $filename));
+			return \RX_BASEURL . $filename . '?t=' . filemtime(\RX_BASEDIR . $filename);
 		}
 		else
 		{
@@ -64,7 +64,7 @@ class Icon
 		{
 			$width = $info['width'];
 			$height = $info['height'];
-			return \RX_BASEURL . $info['filename'] . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $info['filename']));
+			return \RX_BASEURL . $info['filename'] . '?t=' . filemtime(\RX_BASEDIR . $info['filename']);
 		}
 		else
 		{
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index af5655219..6d242678f 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -783,7 +783,7 @@ class CommentItem extends BaseObject
 			}
 			else
 			{
-				return $thumbnail_url . '?' . date('YmdHis', filemtime($thumbnail_file));
+				return $thumbnail_url . '?t=' . filemtime($thumbnail_file);
 			}
 		}
 
@@ -798,7 +798,7 @@ class CommentItem extends BaseObject
 		clearstatcache(true, $thumbnail_file);
 		if (file_exists($thumbnail_file) && filesize($thumbnail_file) > 0)
 		{
-			return $thumbnail_url . '?' . date('YmdHis', filemtime($thumbnail_file));
+			return $thumbnail_url . '?t=' . filemtime($thumbnail_file);
 		}
 
 		// return false if neigher attached file nor image;
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 03c9e1f9c..4b4524158 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -1135,7 +1135,7 @@ class DocumentItem extends BaseObject
 			}
 			else
 			{
-				return $thumbnail_url . '?' . date('YmdHis', filemtime($thumbnail_file));
+				return $thumbnail_url . '?t=' . filemtime($thumbnail_file);
 			}
 		}
 
@@ -1149,7 +1149,7 @@ class DocumentItem extends BaseObject
 		clearstatcache(true, $thumbnail_file);
 		if (file_exists($thumbnail_file) && filesize($thumbnail_file) > 0)
 		{
-			return $thumbnail_url . '?' . date('YmdHis', filemtime($thumbnail_file));
+			return $thumbnail_url . '?t=' . filemtime($thumbnail_file);
 		}
 
 		// Get content if it does not exist.
diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index be1ab6665..00833f15f 100644
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -137,7 +137,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 		CKEDITOR.dtd.$removeEmpty.ins = 0;
 
 		// Set the timestamp for plugins.
-		CKEDITOR.timestamp = '{strtoupper(dechex(max($ckeditor_main_filemtime, $ckeditor_config_filemtime, $editor_config_timestamp ?? 0)))}';
+		CKEDITOR.timestamp = '{max($ckeditor_main_filemtime, $ckeditor_config_filemtime, $editor_config_timestamp ?? 0)}';
 
 		// Add editor components.
 		<!--@if($enable_component)-->
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index d1ebd9e8c..8757c4256 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -1109,7 +1109,7 @@ class MemberModel extends Member
 					$info = new stdClass();
 					$info->width = $width;
 					$info->height = $height;
-					$info->src = \RX_BASEURL . $image_name_file . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $image_name_file));
+					$info->src = \RX_BASEURL . $image_name_file . '?t=' . filemtime(\RX_BASEDIR . $image_name_file);
 					$info->file = './'.$image_name_file;
 					$GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
 					break;
@@ -1142,7 +1142,7 @@ class MemberModel extends Member
 				$info = new stdClass;
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = \RX_BASEURL . $image_name_file. '?' . date('YmdHis', filemtime(\RX_BASEDIR . $image_name_file));
+				$info->src = \RX_BASEURL . $image_name_file. '?t=' . filemtime(\RX_BASEDIR . $image_name_file);
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
 			}
@@ -1176,7 +1176,7 @@ class MemberModel extends Member
 				$info = new stdClass;
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = \RX_BASEURL . $image_mark_file . '?' . date('YmdHis', filemtime(\RX_BASEDIR . $image_mark_file));
+				$info->src = \RX_BASEURL . $image_mark_file . '?t=' . filemtime(\RX_BASEDIR . $image_mark_file);
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
 			}
@@ -1232,7 +1232,7 @@ class MemberModel extends Member
 								$localpath = str_replace('/./', '/', parse_url($info->src, PHP_URL_PATH));
 								if(file_exists($_SERVER['DOCUMENT_ROOT'] . $localpath))
 								{
-									$info->src = $localpath . '?' . date('YmdHis', filemtime($_SERVER['DOCUMENT_ROOT'] . $localpath));
+									$info->src = $localpath . '?t=' . filemtime($_SERVER['DOCUMENT_ROOT'] . $localpath);
 								}
 							}
 							$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php
index 5e5377bbb..5e9da0a0d 100644
--- a/modules/rss/rss.model.php
+++ b/modules/rss/rss.model.php
@@ -19,7 +19,7 @@ class rssModel extends rss
 		$config->feed_document_count = intval($config->feed_document_count ?? 15) ?: 15;
 		if (isset($config->image) && $config->image)
 		{
-			$config->image_url = $config->image . '?' . date('YmdHis', filemtime($config->image));
+			$config->image_url = $config->image . '?t=' . filemtime($config->image);
 		}
 
 		return $config;