diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag
index cb676badb..c7fed91db 100644
--- a/src/web/app/common/tags/messaging/room.tag
+++ b/src/web/app/common/tags/messaging/room.tag
@@ -136,8 +136,8 @@
 		this.connection = new this.MessagingStreamConnection(this.I, this.user.id);
 
 		this.on('mount', () => {
-			this.connection.event.on('message' this.onMessage);
-			this.connection.event.on('read' this.onRead);
+			this.connection.event.on('message', this.onMessage);
+			this.connection.event.on('read', this.onRead);
 
 			document.addEventListener('visibilitychange', this.onVisibilitychange);
 
diff --git a/src/web/app/common/tags/number.tag b/src/web/app/common/tags/number.tag
index 212a80b73..7dcbceba6 100644
--- a/src/web/app/common/tags/number.tag
+++ b/src/web/app/common/tags/number.tag
@@ -2,13 +2,12 @@
 	<style>
 		:scope
 			display inline
-
 	</style>
 	<script>
 		this.on('mount', () => {
 			// https://github.com/riot/riot/issues/2103
 			//value = this.opts.value
-			const value = this.opts.riotValue;
+			let value = this.opts.riotValue;
 			const max = this.opts.max;
 
 			if (max != null && value > max) value = max;
diff --git a/src/web/app/desktop/tags/analog-clock.tag b/src/web/app/desktop/tags/analog-clock.tag
index 4ac6d2281..c7f200746 100644
--- a/src/web/app/desktop/tags/analog-clock.tag
+++ b/src/web/app/desktop/tags/analog-clock.tag
@@ -8,12 +8,10 @@
 				height 256px
 	</style>
 	<script>
-		class Vec2 {
-			constructor(x, y) {
-				this.x = x;
-				this.y = y;
-			}
-		}
+		const Vec2 = function(x, y) {
+			this.x = x;
+			this.y = y;
+		};
 
 		this.on('mount', () => {
 			this.draw()
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index 5d12f2419..d92d4bbaf 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -144,7 +144,7 @@
 
 	</style>
 	<script>
-		this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
+		this.bytesToSize = require('../../../common/scripts/bytes-to-size');
 
 		this.mixin('i');
 
@@ -203,7 +203,7 @@
 				type: 'file',
 				id: this.file.id,
 				file: this.file
-			});
+			}));
 			this.isDragging = true;
 
 			// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
diff --git a/src/web/app/desktop/tags/home-widgets/calendar.tag b/src/web/app/desktop/tags/home-widgets/calendar.tag
index 2a455edff..9aa4ac632 100644
--- a/src/web/app/desktop/tags/home-widgets/calendar.tag
+++ b/src/web/app/desktop/tags/home-widgets/calendar.tag
@@ -115,7 +115,7 @@
 			this.year = ny;
 			this.month = nm + 1;
 			this.day = nd;
-			this.weekDay = ['日', '月', '火', '水' '木', '金', '土'][now.getDay()];
+			this.weekDay = ['日', '月', '火', '水', '木', '金', '土'][now.getDay()];
 
 			this.dayNumer   = now - new Date(ny, nm, nd);
 			this.dayDenom   = 1000/*ms*/ * 60/*s*/ * 60/*m*/ * 24/*h*/;
diff --git a/src/web/app/desktop/tags/home-widgets/notifications.tag b/src/web/app/desktop/tags/home-widgets/notifications.tag
index 5ed26b5d7..5d71407b4 100644
--- a/src/web/app/desktop/tags/home-widgets/notifications.tag
+++ b/src/web/app/desktop/tags/home-widgets/notifications.tag
@@ -44,7 +44,7 @@
 	</style>
 	<script>
 		this.settings = () => {
-			const w = riot.mount(document.body.appendChild(document.createElement('mk-settings-window')[0];
+			const w = riot.mount(document.body.appendChild(document.createElement('mk-settings-window')))[0];
 			w.switch('notification');
 		};
 	</script>
diff --git a/src/web/app/desktop/tags/repost-form.tag b/src/web/app/desktop/tags/repost-form.tag
index de10a37f0..e5101d9f2 100644
--- a/src/web/app/desktop/tags/repost-form.tag
+++ b/src/web/app/desktop/tags/repost-form.tag
@@ -139,6 +139,7 @@
 					wait: false
 				});
 			});
+		};
 
 		this.onquote = () => {
 			this.quote = true;
diff --git a/src/web/app/desktop/tags/timeline-post-sub.tag b/src/web/app/desktop/tags/timeline-post-sub.tag
index 2c76527f1..905bc7aac 100644
--- a/src/web/app/desktop/tags/timeline-post-sub.tag
+++ b/src/web/app/desktop/tags/timeline-post-sub.tag
@@ -8,15 +8,6 @@
 			</div>
 		</div>
 	</article>
-	<script>
-		this.mixin('date-stringify');
-		this.mixin('user-preview');
-
-		this.post = this.opts.post
-
-		this.title = @date-stringify this.post.created_at
-
-	</script>
 	<style>
 		:scope
 			display block
@@ -97,4 +88,11 @@
 								font-size 80%
 
 	</style>
+	<script>
+		this.mixin('date-stringify');
+		this.mixin('user-preview');
+
+		this.post = this.opts.post;
+		this.title = this.dateStringify(this.post.created_at);
+	</script>
 </mk-timeline-post-sub>
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 832299e32..0669d252a 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -14,7 +14,7 @@
 		this.mixin('i');
 
 		this.openPostForm = () => {
-			riot.mount(document.body.appendChild(document.createElement('mk-post-form-window');
+			riot.mount(document.body.appendChild(document.createElement('mk-post-form-window')));
 		};
 
 		this.on('mount', () => {
diff --git a/src/web/app/desktop/tags/user-timeline.tag b/src/web/app/desktop/tags/user-timeline.tag
index e8ff3dc05..4851eb0a1 100644
--- a/src/web/app/desktop/tags/user-timeline.tag
+++ b/src/web/app/desktop/tags/user-timeline.tag
@@ -70,6 +70,7 @@
 				});
 
 				this.fetch(() => this.trigger('loaded'));
+			});
 		});
 
 		this.on('unmount', () => {
diff --git a/src/web/app/mobile/tags/drive/file.tag b/src/web/app/mobile/tags/drive/file.tag
index f800fd69e..4b8216219 100644
--- a/src/web/app/mobile/tags/drive/file.tag
+++ b/src/web/app/mobile/tags/drive/file.tag
@@ -122,7 +122,7 @@
 
 	</style>
 	<script>
-		this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
+		this.bytesToSize = require('../../../common/scripts/bytes-to-size');
 
 		this.browser = this.parent;
 		this.file = this.opts.file;
diff --git a/src/web/app/mobile/tags/page/drive.tag b/src/web/app/mobile/tags/page/drive.tag
index c4cc64261..a064a0559 100644
--- a/src/web/app/mobile/tags/page/drive.tag
+++ b/src/web/app/mobile/tags/page/drive.tag
@@ -64,5 +64,6 @@
 					type: file.type
 				});
 			});
+		});
 	</script>
 </mk-drive-page>
diff --git a/src/web/app/mobile/tags/user-followers.tag b/src/web/app/mobile/tags/user-followers.tag
index 3a1fc1d4b..e939da6c6 100644
--- a/src/web/app/mobile/tags/user-followers.tag
+++ b/src/web/app/mobile/tags/user-followers.tag
@@ -23,6 +23,6 @@
 			this.refs.list.on('loaded', () => {
 				this.trigger('loaded');
 			});
-		};
+		});
 	</script>
 </mk-user-followers>
diff --git a/webpack.config.ts b/webpack.config.ts
index 6928536ff..66d4eb2e1 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -31,7 +31,6 @@ module.exports = (config, commit, env) => {
 					loader: 'riot-tag-loader',
 					query: {
 						hot: false,
-						type: 'es6',
 						style: 'stylus',
 						expr: false,
 						compact: true,