diff --git a/mixins/SoundTrack.pixy b/mixins/SoundTrack.pixy
index 6c9ac86b..696078f4 100644
--- a/mixins/SoundTrack.pixy
+++ b/mixins/SoundTrack.pixy
@@ -28,10 +28,10 @@ component SoundTrackMedia(track *arn.SoundTrack)
 
 component SoundTrackFooter(track *arn.SoundTrack)
 	.soundtrack-footer
-		if track.Title == ""
+		if track.NewTitle.ByUser(nil) == ""
 			a(href=track.Link() + "/edit") untitled
 		else
-			a(href=track.Link())= track.Title
+			a(href=track.Link())= track.NewTitle.ByUser(nil)
 		span  posted 
 		span.utc-date(data-date=track.Created)
 		span  by 
diff --git a/pages/anime/tracks.pixy b/pages/anime/tracks.pixy
index 4a6ae1d3..a7b754d1 100644
--- a/pages/anime/tracks.pixy
+++ b/pages/anime/tracks.pixy
@@ -1,17 +1,8 @@
 component AnimeTracks(anime *arn.Anime, tracks []*arn.SoundTrack)
-	//- AnimeTabs(anime)
-
 	if len(tracks) > 0
 		.anime-section.mountable
 			h3.anime-section-name Tracks
 
 			.soundtracks.anime-soundtracks
 				each track in tracks
-					SoundTrack(track)
-
-			//- .anime-soundtracks
-			//- 	each track in tracks
-			//- 		.anime-soundtrack.mountable(data-mountable-type="track")
-			//- 			.video-container
-			//- 				iframe.video.lazy(data-src=track.Media[0].EmbedLink(), allowfullscreen="allowfullscreen")
-			//- 			a.soundtrack-footer(href=track.Link())= track.Title
\ No newline at end of file
+					SoundTrack(track)
\ No newline at end of file
diff --git a/pages/editor/filtersoundtracks/filtersoundtracks.pixy b/pages/editor/filtersoundtracks/filtersoundtracks.pixy
index 5326de2d..18c47403 100644
--- a/pages/editor/filtersoundtracks/filtersoundtracks.pixy
+++ b/pages/editor/filtersoundtracks/filtersoundtracks.pixy
@@ -13,7 +13,7 @@ component SoundTracksEditorList(tracks []*arn.SoundTrack, count int, url string,
 				tr.mountable
 					td= len(track.Likes)
 					td
-						a(href=track.Link(), target="_blank", rel="noopener")= track.Title
+						a(href=track.Link(), target="_blank", rel="noopener")= track.NewTitle.ByUser(user)
 					td
 						each media in track.Media
 							if media.Service == "Youtube"
diff --git a/pages/search/search.pixy b/pages/search/search.pixy
index 0aeb97bd..eca4a472 100644
--- a/pages/search/search.pixy
+++ b/pages/search/search.pixy
@@ -104,7 +104,7 @@ component SoundTrackSearchResults(tracks []*arn.SoundTrack)
 		ul.soundtrack-search
 			each track in tracks
 				li.mountable(data-mountable-type="track")
-					a(href=track.Link())= track.Title
+					a(href=track.Link())= track.NewTitle.ByUser(nil)
 					span.soundtrack-search-anime= " - " + track.MainAnime().Title.Canonical
 
 component CompanySearchResults(companies []*arn.Company)
diff --git a/pages/soundtrack/edit.go b/pages/soundtrack/edit.go
index 72bfa8ef..56626702 100644
--- a/pages/soundtrack/edit.go
+++ b/pages/soundtrack/edit.go
@@ -23,7 +23,7 @@ func Edit(ctx *aero.Context) string {
 
 	ctx.Data = &arn.OpenGraph{
 		Tags: map[string]string{
-			"og:title":     track.Title,
+			"og:title":     track.NewTitle.ByUser(user),
 			"og:url":       "https://" + ctx.App.Config.Domain + track.Link(),
 			"og:site_name": "notify.moe",
 			"og:type":      "music.song",
diff --git a/pages/soundtrack/soundtrack.go b/pages/soundtrack/soundtrack.go
index bfc3b238..dfab7178 100644
--- a/pages/soundtrack/soundtrack.go
+++ b/pages/soundtrack/soundtrack.go
@@ -32,7 +32,7 @@ func Get(ctx *aero.Context) string {
 
 	openGraph := &arn.OpenGraph{
 		Tags: map[string]string{
-			"og:title":       track.Title,
+			"og:title":       track.NewTitle.ByUser(user),
 			"og:description": track.MainAnime().Title.Canonical + " (" + strings.Join(descriptionTags, ", ") + ")",
 			"og:url":         "https://" + ctx.App.Config.Domain + track.Link(),
 			"og:site_name":   ctx.App.Config.Domain,
diff --git a/pages/soundtrack/soundtrack.pixy b/pages/soundtrack/soundtrack.pixy
index 0397e580..fc322e47 100644
--- a/pages/soundtrack/soundtrack.pixy
+++ b/pages/soundtrack/soundtrack.pixy
@@ -2,10 +2,10 @@ component SoundTrackPage(track *arn.SoundTrack, user *arn.User)
 	SoundTrackTabs(track, user)
 
 	.soundtrack-full-page
-		if track.Title == ""
+		if track.NewTitle.ByUser(user) == ""
 			h1.mountable untitled
 		else
-			h1.mountable= track.Title
+			h1.mountable= track.NewTitle.ByUser(user)
 
 		.widget-form.soundtrack-media-list
 			each media in track.Media
diff --git a/patches/add-song-titles/add-song-titles.go b/patches/add-song-titles/add-song-titles.go
index e69de29b..cb1891a9 100644
--- a/patches/add-song-titles/add-song-titles.go
+++ b/patches/add-song-titles/add-song-titles.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/animenotifier/arn"
+)
+
+func main() {
+	defer arn.Node.Close()
+
+	for track := range arn.StreamSoundTracks() {
+		if arn.ContainsUnicodeLetters(track.Title) {
+			track.NewTitle.Native = track.Title
+		} else {
+			track.NewTitle.Canonical = track.Title
+		}
+
+		track.Save()
+	}
+}
diff --git a/scripts/AudioPlayer.ts b/scripts/AudioPlayer.ts
index 8b206181..a654454b 100644
--- a/scripts/AudioPlayer.ts
+++ b/scripts/AudioPlayer.ts
@@ -260,7 +260,7 @@ export default class AudioPlayer {
 		let trackInfoResponse = await fetch("/api/soundtrack/" + trackId)
 		let track = await trackInfoResponse.json()
 		this.trackLink.href = "/soundtrack/" + track.id
-		this.trackLink.innerText = track.title
+		this.trackLink.innerText = track.title.canonical || track.title.native
 
 		let animeId = ""