diff --git a/.env.example b/.env.example
index 8bb4f58403c..4875ae3057e 100644
--- a/.env.example
+++ b/.env.example
@@ -290,6 +290,7 @@ CLIENT_CHECK_VERSION=false
 # SCORES_EXPERIMENTAL_RANK_AS_EXTRA=false
 # SCORES_PROCESSING_QUEUE=osu-queue:score-statistics
 # SCORES_SUBMISSION_ENABLED=1
+# SCORE_INDEX_MAX_ID_DISTANCE=10_000_000
 
 # BANCHO_BOT_USER_ID=
 
diff --git a/app/Casts/TimestampOrZero.php b/app/Casts/TimestampOrZero.php
new file mode 100644
index 00000000000..7a65fcbf73c
--- /dev/null
+++ b/app/Casts/TimestampOrZero.php
@@ -0,0 +1,27 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Casts;
+
+use Carbon\Carbon;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+
+/**
+ * For columns which use unix timestamp as its value and repurpose 0 as null.
+ */
+class TimestampOrZero implements CastsAttributes
+{
+    public function get($model, string $key, $value, array $attributes)
+    {
+        return $value === null || $value === 0 ? null : Carbon::createFromTimestamp($value);
+    }
+
+    public function set($model, string $key, $value, array $attributes)
+    {
+        return $value === null ? 0 : $value->getTimestamp();
+    }
+}
diff --git a/app/Http/Controllers/BeatmapTagsController.php b/app/Http/Controllers/BeatmapTagsController.php
index 87c9d9b253b..f6cf56b035a 100644
--- a/app/Http/Controllers/BeatmapTagsController.php
+++ b/app/Http/Controllers/BeatmapTagsController.php
@@ -23,22 +23,6 @@ public function __construct()
                 'destroy',
             ],
         ]);
-
-        $this->middleware('require-scopes:public', ['only' => 'index']);
-    }
-
-    public function index($beatmapId)
-    {
-        $topBeatmapTags = cache_remember_mutexed(
-            "beatmap_tags:{$beatmapId}",
-            $GLOBALS['cfg']['osu']['tags']['beatmap_tags_cache_duration'],
-            [],
-            fn () => Tag::topTags($beatmapId),
-        );
-
-        return [
-            'beatmap_tags' => $topBeatmapTags,
-        ];
     }
 
     public function destroy($beatmapId, $tagId)
diff --git a/app/Http/Controllers/BeatmapsController.php b/app/Http/Controllers/BeatmapsController.php
index dca765187d0..be0feca32b1 100644
--- a/app/Http/Controllers/BeatmapsController.php
+++ b/app/Http/Controllers/BeatmapsController.php
@@ -24,7 +24,7 @@
 class BeatmapsController extends Controller
 {
     const DEFAULT_API_INCLUDES = ['beatmapset.ratings', 'failtimes', 'max_combo'];
-    const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover'];
+    const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover', 'user.team'];
 
     public function __construct()
     {
@@ -74,7 +74,7 @@ private static function beatmapScores(string $id, ?string $scoreTransformerType,
             'type' => $type,
             'user' => $currentUser,
         ]);
-        $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'processHistory']);
+        $scores = $esFetch->all()->loadMissing(['beatmap', 'user.country', 'user.team', 'processHistory']);
         $userScore = $esFetch->userBest();
         $scoreTransformer = new ScoreTransformer($scoreTransformerType);
 
diff --git a/app/Http/Controllers/BeatmapsetsController.php b/app/Http/Controllers/BeatmapsetsController.php
index d0958f9567a..a2da6fc6b37 100644
--- a/app/Http/Controllers/BeatmapsetsController.php
+++ b/app/Http/Controllers/BeatmapsetsController.php
@@ -404,6 +404,7 @@ private function showJson($beatmapset)
             'beatmaps.failtimes',
             'beatmaps.max_combo',
             'beatmaps.owners',
+            'beatmaps.top_tag_ids',
             'converts',
             'converts.failtimes',
             'converts.owners',
@@ -415,6 +416,7 @@ private function showJson($beatmapset)
             'pack_tags',
             'ratings',
             'recent_favourites',
+            'related_tags',
             'related_users',
             'user',
         ]);
diff --git a/app/Http/Controllers/Chat/ChatController.php b/app/Http/Controllers/Chat/ChatController.php
index 1f949f6679e..27c7d2edf28 100644
--- a/app/Http/Controllers/Chat/ChatController.php
+++ b/app/Http/Controllers/Chat/ChatController.php
@@ -89,39 +89,44 @@ public function ack()
      * @bodyParam uuid string client-side message identifier which will be sent back in response and websocket json. Example: some-uuid-string
      *
      * @response {
-     *   "channel": [
-     *     {
-     *       "channel_id": 1234,
-     *       "current_user_attributes": {
-     *         "can_message": true,
-     *         "can_message_error": null,
-     *         "last_read_id": 9150005005
-     *       },
-     *       "name": "peppy",
-     *       "description": "",
-     *       "type": "PM",
-     *       "last_read_id": 9150005005,
-     *       "last_message_id": 9150005005
-     *     }
-     *   ],
+     *   "channel": {
+     *     "channel_id": 1234,
+     *     "description": "",
+     *     "icon": "https://a.ppy.sh/102?1500537068"
+     *     "message_length_limit": 450,
+     *     "moderated": false,
+     *     "name": "peppy",
+     *     "type": "PM",
+     *     "uuid": null,
+     *     "last_message_id": 9150005005,
+     *     "users": [
+     *       101,
+     *       102
+     *     ]
+     *   },
      *   "message": {
-     *     "message_id": 9150005005,
-     *     "sender_id": 102,
      *     "channel_id": 1234,
-     *     "timestamp": "2018-07-06T06:33:42+00:00",
      *     "content": "i can haz featured artist plz?",
      *     "is_action": false,
+     *     "message_id": 9150005005,
+     *     "sender_id": 102,
+     *     "timestamp": "2024-12-23T01:23:45+00:00",
+     *     "type": "plain",
      *     "uuid": "some-uuid-string",
      *     "sender": {
-     *       "id": 102,
-     *       "username": "nekodex",
-     *       "profile_colour": "#333333",
      *       "avatar_url": "https://a.ppy.sh/102?1500537068",
      *       "country_code": "AU",
+     *       "default_group": "default",
+     *       "id": 102,
      *       "is_active": true,
      *       "is_bot": false,
+     *       "is_deleted": false,
      *       "is_online": true,
      *       "is_supporter": true
+     *       "last_visit": "2024-12-23T01:23:45+00:00",
+     *       "pm_friends_only": false,
+     *       "profile_colour": "#333333",
+     *       "username": "nekodex",
      *     }
      *   },
      *   "new_channel_id": 1234,
diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php
index d8c4e34b628..ce704bcfe5c 100644
--- a/app/Http/Controllers/Forum/TopicsController.php
+++ b/app/Http/Controllers/Forum/TopicsController.php
@@ -396,6 +396,7 @@ public function show($id)
             'user.country',
             'user.rank',
             'user.supporterTagPurchases',
+            'user.team',
             'user.userGroups',
         ]);
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 0cd6ff043d9..3bd96032464 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -16,6 +16,7 @@
 use App\Models\NewsPost;
 use App\Models\UserDonation;
 use App\Transformers\MenuImageTransformer;
+use App\Transformers\UserCompactTransformer;
 use Auth;
 use Jenssegers\Agent\Agent;
 use Request;
@@ -142,12 +143,11 @@ public function quickSearch()
                 $result[$mode]['total'] = $search->count();
             }
 
-            $result['user']['users'] = json_collection($searches['user']->data(), 'UserCompact', [
-                'country',
-                'cover',
-                'groups',
-                'support_level',
-            ]);
+            $result['user']['users'] = json_collection(
+                $searches['user']->data(),
+                new UserCompactTransformer(),
+                [...UserCompactTransformer::CARD_INCLUDES, 'support_level'],
+            );
             $result['beatmapset']['beatmapsets'] = json_collection($searches['beatmapset']->data(), 'Beatmapset', ['beatmaps']);
         }
 
@@ -210,7 +210,7 @@ public function setLocale()
             ]);
         }
 
-        return ext_view('layout.ujs-reload', [], 'js')
+        return ext_view('layout.ujs_full_reload', [], 'js')
             ->withCookie(cookie()->forever('locale', $newLocale));
     }
 
diff --git a/app/Http/Controllers/InterOp/BeatmapsetsController.php b/app/Http/Controllers/InterOp/BeatmapsetsController.php
index ed8a9de7803..64b5f1d8064 100644
--- a/app/Http/Controllers/InterOp/BeatmapsetsController.php
+++ b/app/Http/Controllers/InterOp/BeatmapsetsController.php
@@ -12,6 +12,7 @@
 use App\Models\BeatmapDiscussion;
 use App\Models\BeatmapDiscussionPost;
 use App\Models\Beatmapset;
+use App\Models\Event;
 use App\Models\User;
 
 class BeatmapsetsController extends Controller
@@ -22,6 +23,10 @@ public function broadcastNew($id)
 
         (new UserBeatmapsetNew($beatmapset))->dispatch();
 
+        if (request()->boolean('create_event')) {
+            Event::generate('beatmapsetUpload', ['beatmapset' => $beatmapset]);
+        }
+
         return response(null, 204);
     }
 
@@ -31,6 +36,20 @@ public function broadcastRevive($id)
 
         (new UserBeatmapsetRevive($beatmapset))->dispatch();
 
+        if (request()->boolean('create_event')) {
+            Event::generate('beatmapsetRevive', ['beatmapset' => $beatmapset]);
+        }
+
+        return response(null, 204);
+    }
+
+    public function broadcastUpdate($id)
+    {
+        $beatmapset = Beatmapset::findOrFail($id);
+        $user = User::findOrFail(request()->integer('user_id'));
+
+        Event::generate('beatmapsetUpdate', ['beatmapset' => $beatmapset, 'user' => $user]);
+
         return response(null, 204);
     }
 
diff --git a/app/Http/Controllers/InterOp/Multiplayer/RoomsController.php b/app/Http/Controllers/InterOp/Multiplayer/RoomsController.php
new file mode 100644
index 00000000000..27e08dfbb9c
--- /dev/null
+++ b/app/Http/Controllers/InterOp/Multiplayer/RoomsController.php
@@ -0,0 +1,35 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace App\Http\Controllers\InterOp\Multiplayer;
+
+use App\Http\Controllers\Controller;
+use App\Models\Multiplayer\Room;
+use App\Models\User;
+use App\Transformers\Multiplayer\RoomTransformer;
+
+class RoomsController extends Controller
+{
+    public function join(string $id, string $userId)
+    {
+        $user = User::findOrFail($userId);
+        $room = Room::findOrFail($id);
+
+        $room->assertCorrectPassword(get_string(request('password')));
+        $room->join($user);
+
+        return RoomTransformer::createShowResponse($room);
+    }
+
+    public function store()
+    {
+        $params = \Request::all();
+        $user = User::findOrFail(get_int($params['user_id'] ?? null));
+
+        $room = (new Room())->startGame($user, $params);
+
+        return RoomTransformer::createShowResponse($room);
+    }
+}
diff --git a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php
index ea1f7321d1f..19b79dde254 100644
--- a/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php
+++ b/app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php
@@ -5,7 +5,6 @@
 
 namespace App\Http\Controllers\Multiplayer\Rooms\Playlist;
 
-use App\Exceptions\InvariantException;
 use App\Http\Controllers\Controller as BaseController;
 use App\Libraries\ClientCheck;
 use App\Models\Multiplayer\PlaylistItem;
@@ -182,15 +181,11 @@ public function store($roomId, $playlistId)
         $playlistItem = $room->playlist()->findOrFail($playlistId);
         $user = \Auth::user();
         $request = \Request::instance();
-        $params = $request->all();
 
-        if (get_string($params['beatmap_hash'] ?? null) !== $playlistItem->beatmap->checksum) {
-            throw new InvariantException(osu_trans('score_tokens.create.beatmap_hash_invalid'));
-        }
-
-        $buildId = ClientCheck::parseToken($request)['buildId'];
-
-        $scoreToken = $room->startPlay($user, $playlistItem, $buildId);
+        $scoreToken = $room->startPlay($user, $playlistItem, [
+            ...$request->all(),
+            'build_id' => ClientCheck::parseToken($request)['buildId'],
+        ]);
 
         return json_item($scoreToken, new ScoreTokenTransformer());
     }
diff --git a/app/Http/Controllers/Multiplayer/RoomsController.php b/app/Http/Controllers/Multiplayer/RoomsController.php
index 97c6e7fd555..00d0bdd7c13 100644
--- a/app/Http/Controllers/Multiplayer/RoomsController.php
+++ b/app/Http/Controllers/Multiplayer/RoomsController.php
@@ -5,7 +5,6 @@
 
 namespace App\Http\Controllers\Multiplayer;
 
-use App\Exceptions\InvariantException;
 use App\Http\Controllers\Controller;
 use App\Http\Controllers\Ranking\DailyChallengeController;
 use App\Models\Model;
@@ -101,24 +100,18 @@ public function index()
 
     public function join($roomId, $userId)
     {
+        $currentUser = \Auth::user();
         // this allows admins/whatever to add users to games in the future
-        if (get_int($userId) !== auth()->user()->user_id) {
+        if (get_int($userId) !== $currentUser->getKey()) {
             abort(403);
         }
 
         $room = Room::findOrFail($roomId);
+        $room->assertCorrectPassword(get_string(request('password')));
 
-        if ($room->password !== null) {
-            $password = get_param_value(request('password'), null);
-
-            if ($password === null || !hash_equals(hash('sha256', $room->password), hash('sha256', $password))) {
-                abort(403, osu_trans('multiplayer.room.invalid_password'));
-            }
-        }
-
-        $room->join(auth()->user());
+        $room->join($currentUser);
 
-        return $this->createJoinedRoomResponse($room);
+        return RoomTransformer::createShowResponse($room);
     }
 
     public function leaderboard($roomId)
@@ -168,7 +161,7 @@ public function show($id)
         }
 
         if (is_api_request()) {
-            return $this->createJoinedRoomResponse($room);
+            return RoomTransformer::createShowResponse($room);
         }
 
         if ($room->category === 'daily_challenge') {
@@ -200,32 +193,8 @@ public function show($id)
 
     public function store()
     {
-        try {
-            $room = (new Room())->startGame(auth()->user(), request()->all());
-
-            return $this->createJoinedRoomResponse($room);
-        } catch (InvariantException $e) {
-            return error_popup($e->getMessage(), $e->getStatusCode());
-        }
-    }
+        $room = (new Room())->startGame(\Auth::user(), \Request::all());
 
-    private function createJoinedRoomResponse($room)
-    {
-        return json_item(
-            $room->loadMissing([
-                'host',
-                'playlist.beatmap.beatmapset',
-                'playlist.beatmap.baseMaxCombo',
-            ]),
-            'Multiplayer\Room',
-            [
-                'current_user_score.playlist_item_attempts',
-                'host.country',
-                'playlist.beatmap.beatmapset',
-                'playlist.beatmap.checksum',
-                'playlist.beatmap.max_combo',
-                'recent_participants',
-            ]
-        );
+        return RoomTransformer::createShowResponse($room);
     }
 }
diff --git a/app/Http/Controllers/RankingController.php b/app/Http/Controllers/RankingController.php
index 51980dc82d8..ad64bb83332 100644
--- a/app/Http/Controllers/RankingController.php
+++ b/app/Http/Controllers/RankingController.php
@@ -174,7 +174,7 @@ public function index($mode, $type)
             $table = (new $class())->getTable();
             $ppColumn = $class::ppColumn();
             $stats = $class
-                ::with(['user', 'user.country'])
+                ::with(['user', 'user.country', 'user.team'])
                 ->where($ppColumn, '>', 0)
                 ->whereHas('user', function ($userQuery) {
                     $userQuery->default();
@@ -307,6 +307,7 @@ public function kudosu()
         $page = min(get_int(request('page')) ?? 1, $maxPage);
 
         $scores = User::default()
+            ->with('team')
             ->orderBy('osu_kudostotal', 'desc')
             ->paginate(static::PAGE_SIZE, ['*'], 'page', $page, $maxResults);
 
diff --git a/app/Http/Controllers/ScoreTokensController.php b/app/Http/Controllers/ScoreTokensController.php
index 06a392e7358..7f352f081aa 100644
--- a/app/Http/Controllers/ScoreTokensController.php
+++ b/app/Http/Controllers/ScoreTokensController.php
@@ -29,33 +29,20 @@ public function store($beatmapId)
         $beatmap = Beatmap::increasesStatistics()->findOrFail($beatmapId);
         $user = auth()->user();
         $request = \Request::instance();
-        $params = get_params($request->all(), null, [
-            'beatmap_hash',
-            'ruleset_id:int',
-        ]);
-
-        $checks = [
-            'beatmap_hash' => fn (string $value): bool => $value === $beatmap->checksum,
-            'ruleset_id' => fn (int $value): bool => Beatmap::modeStr($value) !== null && $beatmap->canBeConvertedTo($value),
-        ];
-        foreach ($checks as $key => $testFn) {
-            if (!isset($params[$key])) {
-                throw new InvariantException("missing {$key}");
-            }
-            if (!$testFn($params[$key])) {
-                throw new InvariantException("invalid {$key}");
-            }
-        }
 
-        $buildId = ClientCheck::parseToken($request)['buildId'];
+        $scoreToken = new ScoreToken([
+            'beatmap_id' => $beatmap->getKey(),
+            'build_id' => ClientCheck::parseToken($request)['buildId'],
+            'user_id' => $user->getKey(),
+            ...get_params($request->all(), null, [
+                'beatmap_hash',
+                'ruleset_id:int',
+            ]),
+        ]);
+        $scoreToken->setRelation('beatmap', $beatmap);
 
         try {
-            $scoreToken = ScoreToken::create([
-                'beatmap_id' => $beatmap->getKey(),
-                'build_id' => $buildId,
-                'ruleset_id' => $params['ruleset_id'],
-                'user_id' => $user->getKey(),
-            ]);
+            $scoreToken->saveOrExplode();
         } catch (PDOException $e) {
             // TODO: move this to be a validation inside Score model
             throw new InvariantException('failed creating score token');
diff --git a/app/Http/Controllers/ScoresController.php b/app/Http/Controllers/ScoresController.php
index b5ecde1b294..8ed3b29dc9e 100644
--- a/app/Http/Controllers/ScoresController.php
+++ b/app/Http/Controllers/ScoresController.php
@@ -6,6 +6,7 @@
 namespace App\Http\Controllers;
 
 use App\Enums\Ruleset;
+use App\Models\Beatmap;
 use App\Models\Score\Best\Model as ScoreBest;
 use App\Models\ScoreReplayStats;
 use App\Models\Solo\Score as SoloScore;
@@ -22,8 +23,9 @@ public function __construct()
         parent::__construct();
 
         $this->middleware('auth', ['except' => [
-            'show',
             'download',
+            'index',
+            'show',
         ]]);
 
         $this->middleware('require-scopes:public');
@@ -117,6 +119,92 @@ public function download($rulesetOrSoloId, $id = null)
         }, $this->makeReplayFilename($score), $responseHeaders);
     }
 
+    /**
+     * Get Scores
+     *
+     * Returns all passed scores. Up to 1000 scores will be returned in order of oldest to latest.
+     * Most recent scores will be returned if `cursor_string` parameter is not specified.
+     *
+     * Obtaining new scores that arrived after the last request can be done by passing `cursor_string`
+     * parameter from the previous request.
+     *
+     * ---
+     *
+     * ### Response Format
+     *
+     * Field         | Type                          | Notes
+     * ------------- | ----------------------------- | -----
+     * scores        | [Score](#score)[]             | |
+     * cursor_string | [CursorString](#cursorstring) | Same value as the request will be returned if there's no new scores
+     *
+     * @group Scores
+     *
+     * @queryParam ruleset The [Ruleset](#ruleset) to get scores for.
+     * @queryParam cursor_string Next set of scores
+     */
+    public function index()
+    {
+        $params = \Request::all();
+        $cursor = cursor_from_params($params);
+        $isOldScores = false;
+        if (isset($cursor['id']) && ($idFromCursor = get_int($cursor['id'])) !== null) {
+            $currentMaxId = SoloScore::max('id');
+            $idDistance = $currentMaxId - $idFromCursor;
+            if ($idDistance > $GLOBALS['cfg']['osu']['scores']['index_max_id_distance']) {
+                abort(422, 'cursor is too old');
+            }
+            $isOldScores = $idDistance > 10_000;
+        }
+
+        $rulesetId = null;
+        if (isset($params['ruleset'])) {
+            $rulesetId = Beatmap::modeInt(get_string($params['ruleset']));
+
+            if ($rulesetId === null) {
+                abort(422, 'invalid ruleset parameter');
+            }
+        }
+
+        return \Cache::remember(
+            'score_index:'.($rulesetId ?? '').':'.json_encode($cursor),
+            $isOldScores ? 600 : 5,
+            function () use ($cursor, $isOldScores, $rulesetId) {
+                $cursorHelper = SoloScore::makeDbCursorHelper('old');
+                $scoresQuery = SoloScore::forListing()->limit(1_000);
+                if ($rulesetId !== null) {
+                    $scoresQuery->where('ruleset_id', $rulesetId);
+                }
+                if ($cursor === null || $cursorHelper->prepare($cursor) === null) {
+                    // fetch the latest scores when no or invalid cursor is specified
+                    // and reverse result to match the other query (latest score last)
+                    $scores = array_reverse($scoresQuery->orderByDesc('id')->get()->all());
+                } else {
+                    $scores = $scoresQuery->cursorSort($cursorHelper, $cursor)->get()->all();
+                }
+
+                if ($isOldScores) {
+                    $filteredScores = $scores;
+                } else {
+                    $filteredScores = [];
+                    foreach ($scores as $score) {
+                        // only return up to but not including the earliest unprocessed scores
+                        if ($score->isProcessed()) {
+                            $filteredScores[] = $score;
+                        } else {
+                            break;
+                        }
+                    }
+                }
+
+                return [
+                    'scores' => json_collection($filteredScores, new ScoreTransformer(ScoreTransformer::TYPE_SOLO)),
+                    // return previous cursor if no result, assuming there's no new scores yet
+                    ...cursor_for_response($cursorHelper->next($filteredScores) ?? $cursor),
+                ];
+            },
+        );
+    }
+
     public function show($rulesetOrSoloId, $legacyId = null)
     {
         if ($legacyId === null) {
diff --git a/app/Http/Controllers/TagsController.php b/app/Http/Controllers/TagsController.php
index 80b657d9182..b0ce5c493a9 100644
--- a/app/Http/Controllers/TagsController.php
+++ b/app/Http/Controllers/TagsController.php
@@ -7,9 +7,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Tag;
-use App\Transformers\TagTransformer;
-
 class TagsController extends Controller
 {
     public function __construct()
@@ -21,15 +18,8 @@ public function __construct()
 
     public function index()
     {
-        $tags = cache_remember_mutexed(
-            'tags',
-            $GLOBALS['cfg']['osu']['tags']['tags_cache_duration'],
-            [],
-            fn () => Tag::all(),
-        );
-
         return [
-            'tags' => json_collection($tags, new TagTransformer()),
+            'tags' => app('tags')->json(),
         ];
     }
 }
diff --git a/app/Http/Controllers/Teams/MembersController.php b/app/Http/Controllers/Teams/MembersController.php
new file mode 100644
index 00000000000..3c262ced4e1
--- /dev/null
+++ b/app/Http/Controllers/Teams/MembersController.php
@@ -0,0 +1,53 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Teams;
+
+use App\Http\Controllers\Controller;
+use App\Models\Team;
+use App\Models\TeamMember;
+use Symfony\Component\HttpFoundation\Response;
+
+class MembersController extends Controller
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->middleware('auth');
+    }
+
+    public function destroy(string $teamId, string $userId): Response
+    {
+        $teamMember = TeamMember::where([
+            'team_id' => $teamId,
+            'user_id' => $userId,
+        ])->firstOrFail();
+
+        if ($teamMember->user_id === \Auth::user()->getKey()) {
+            abort(422, 'can not remove self from team');
+        }
+
+        priv_check('TeamUpdate', $teamMember->team)->ensureCan();
+
+        $teamMember->delete();
+        \Session::flash('popup', osu_trans('teams.members.destroy.success'));
+
+        return response(null, 204);
+    }
+
+    public function index(string $teamId): Response
+    {
+        $team = Team::findOrFail($teamId);
+
+        priv_check('TeamUpdate', $team)->ensureCan();
+
+        $team->load('members.user');
+
+        return ext_view('teams.members.index', compact('team'));
+    }
+}
diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php
index 81200002ff9..92b6de5f8f8 100644
--- a/app/Http/Controllers/TeamsController.php
+++ b/app/Http/Controllers/TeamsController.php
@@ -13,6 +13,42 @@
 
 class TeamsController extends Controller
 {
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('auth', ['only' => ['part']]);
+    }
+
+    public function destroy(string $id): Response
+    {
+        $team = Team::findOrFail($id);
+        priv_check('TeamUpdate', $team)->ensureCan();
+
+        $team->delete();
+        \Session::flash('popup', osu_trans('teams.destroy.ok'));
+
+        return ujs_redirect(route('home'));
+    }
+
+    public function edit(string $id): Response
+    {
+        $team = Team::findOrFail($id);
+        priv_check('TeamUpdate', $team)->ensureCan();
+
+        return ext_view('teams.edit', compact('team'));
+    }
+
+    public function part(string $id): Response
+    {
+        $team = Team::findOrFail($id);
+        priv_check('TeamPart', $team)->ensureCan();
+
+        $team->members()->findOrFail(\Auth::user()->getKey())->delete();
+        \Session::flash('popup', osu_trans('teams.part.ok'));
+
+        return ujs_redirect(route('teams.show', ['team' => $team]));
+    }
+
     public function show(string $id): Response
     {
         $team = Team
@@ -23,4 +59,26 @@ public function show(string $id): Response
 
         return ext_view('teams.show', compact('team'));
     }
+
+    public function update(string $id): Response
+    {
+        $team = Team::findOrFail($id);
+        priv_check('TeamUpdate', $team)->ensureCan();
+        $params = get_params(\Request::all(), 'team', [
+            'default_ruleset_id:int',
+            'description',
+            'header:file',
+            'header_remove:bool',
+            'is_open:bool',
+            'logo:file',
+            'logo_remove:bool',
+            'url',
+        ]);
+
+        $team->fill($params)->saveOrExplode();
+
+        \Session::flash('popup', osu_trans('teams.edit.saved'));
+
+        return response(null, 201);
+    }
 }
diff --git a/app/Http/Controllers/Users/LookupController.php b/app/Http/Controllers/Users/LookupController.php
index afe871f58ef..229f906e24d 100644
--- a/app/Http/Controllers/Users/LookupController.php
+++ b/app/Http/Controllers/Users/LookupController.php
@@ -22,7 +22,12 @@ public function __construct()
     public function index()
     {
         // TODO: referer check?
-        $ids = array_slice(array_reject_null(get_arr(request('ids'), presence(...)) ?? []), 0, 50);
+        $params = get_params(\Request::all(), null, [
+            'exclude_bots:bool',
+            'ids:string[]',
+        ]);
+
+        $ids = array_slice(array_reject_null(get_arr($params['ids'] ?? [], presence(...))), 0, 50);
 
         $numericIds = [];
         $stringIds = [];
@@ -35,13 +40,16 @@ public function index()
         }
 
         $users = User::where(fn ($q) => $q->whereIn('user_id', $numericIds)->orWhereIn('username', $stringIds))
-            ->where('group_id', '<>', app('groups')->byIdentifier('no_profile')->getKey())
             ->default()
-            ->with(UserCompactTransformer::CARD_INCLUDES_PRELOAD)
-            ->get();
+            ->withoutNoProfile()
+            ->with(UserCompactTransformer::CARD_INCLUDES_PRELOAD);
+
+        if ($params['exclude_bots'] ?? false) {
+            $users = $users->withoutBots();
+        }
 
         return [
-            'users' => json_collection($users, new UserCompactTransformer(), UserCompactTransformer::CARD_INCLUDES),
+            'users' => json_collection($users->get(), new UserCompactTransformer(), UserCompactTransformer::CARD_INCLUDES),
         ];
     }
 }
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index cd72c10642a..b358af1928c 100644
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -931,6 +931,7 @@ private function showUserIncludes()
             'statistics.country_rank',
             'statistics.rank',
             'statistics.variants',
+            'team',
             'user_achievements',
         ];
 
diff --git a/app/Jobs/Notifications/BeatmapOwnerChange.php b/app/Jobs/Notifications/BeatmapOwnerChange.php
index c72d025e01a..7bd13d744b9 100644
--- a/app/Jobs/Notifications/BeatmapOwnerChange.php
+++ b/app/Jobs/Notifications/BeatmapOwnerChange.php
@@ -15,7 +15,6 @@ class BeatmapOwnerChange extends BroadcastNotificationBase
 
     protected $beatmap;
     protected $beatmapset;
-    protected $user;
 
     public static function getMailLink(Notification $notification): string
     {
@@ -32,7 +31,6 @@ public function __construct(Beatmap $beatmap, User $source)
 
         $this->beatmap = $beatmap;
         $this->beatmapset = $beatmap->beatmapset;
-        $this->user = $beatmap->user;
     }
 
     public function getDetails(): array
@@ -48,7 +46,7 @@ public function getDetails(): array
 
     public function getListeningUserIds(): array
     {
-        return [$this->user->getKey()];
+        return $this->beatmap->beatmapOwners()->pluck('user_id')->all();
     }
 
     public function getNotifiable()
diff --git a/app/Jobs/Notifications/BroadcastNotificationBase.php b/app/Jobs/Notifications/BroadcastNotificationBase.php
index ad99dab6269..503b044fcd0 100644
--- a/app/Jobs/Notifications/BroadcastNotificationBase.php
+++ b/app/Jobs/Notifications/BroadcastNotificationBase.php
@@ -185,7 +185,7 @@ public function handle()
 
         $pushReceiverIds = [];
         $notification->getConnection()->transaction(function () use ($deliverySettings, $notification, &$pushReceiverIds) {
-            $timestamp = (string) $this->getTimestamp();
+            $timestamp = $this->getTimestamp()->format('Y-m-d H:i:s');
             $notificationId = $notification->getKey();
             $tempUserNotification = new UserNotification();
 
diff --git a/app/Libraries/Beatmapset/ChangeBeatmapOwners.php b/app/Libraries/Beatmapset/ChangeBeatmapOwners.php
index 87a869871ba..62f6a702d74 100644
--- a/app/Libraries/Beatmapset/ChangeBeatmapOwners.php
+++ b/app/Libraries/Beatmapset/ChangeBeatmapOwners.php
@@ -43,7 +43,7 @@ public function handle(): void
 
         $newUserIds = $this->userIds->diff($currentOwners);
 
-        if (User::whereIn('user_id', $newUserIds->toArray())->default()->count() !== $newUserIds->count()) {
+        if (User::whereIn('user_id', $newUserIds->toArray())->default()->withoutBots()->withoutNoProfile()->count() !== $newUserIds->count()) {
             throw new InvariantException('invalid user_id');
         }
 
diff --git a/app/Models/Beatmap.php b/app/Models/Beatmap.php
index b107d638d17..9bda60e088d 100644
--- a/app/Models/Beatmap.php
+++ b/app/Models/Beatmap.php
@@ -8,6 +8,7 @@
 use App\Exceptions\InvariantException;
 use App\Jobs\EsDocument;
 use App\Libraries\Transactions\AfterCommit;
+use App\Traits\Memoizes;
 use DB;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
@@ -53,7 +54,7 @@
  */
 class Beatmap extends Model implements AfterCommit
 {
-    use SoftDeletes;
+    use Memoizes, SoftDeletes;
 
     public $convert = false;
 
@@ -348,6 +349,20 @@ public function status()
         return array_search($this->approved, Beatmapset::STATES, true);
     }
 
+    public function topTagIds()
+    {
+        // TODO: Add option to multi query when beatmapset requests all tags for beatmaps?
+        return $this->memoize(
+            __FUNCTION__,
+            fn () => cache_remember_mutexed(
+                "beatmap_top_tag_ids:{$this->getKey()}",
+                $GLOBALS['cfg']['osu']['tags']['beatmap_tags_cache_duration'],
+                [],
+                fn () => $this->beatmapTags()->topTagIds()->limit(50)->get()->toArray(),
+            ),
+        );
+    }
+
     private function getDifficultyrating()
     {
         if ($this->convert) {
diff --git a/app/Models/BeatmapTag.php b/app/Models/BeatmapTag.php
index a4fca351852..a61da0fc571 100644
--- a/app/Models/BeatmapTag.php
+++ b/app/Models/BeatmapTag.php
@@ -7,18 +7,34 @@
 
 namespace App\Models;
 
+use Illuminate\Contracts\Database\Eloquent\Builder;
+
 /**
  * @property-read Beatmap $beatmap
  * @property int $beatmap_id
+ * @property \Carbon\Carbon $created_at
  * @property int $tag_id
+ * @property \Carbon\Carbon $updated_at
  * @property-read User $user
  * @property int $user_id
  */
 class BeatmapTag extends Model
 {
+    public $incrementing = false;
+
     protected $primaryKey = ':composite';
     protected $primaryKeys = ['beatmap_id', 'tag_id', 'user_id'];
 
+    public function scopeTopTagIds(Builder $query)
+    {
+        return $query->whereHas('user', fn ($userQuery) => $userQuery->default())
+            ->groupBy('tag_id')
+            ->select('tag_id')
+            ->selectRaw('COUNT(*) as count')
+            ->orderBy('count', 'desc')
+            ->orderBy('tag_id', 'asc');
+    }
+
     public function beatmap()
     {
         return $this->belongsTo(Beatmap::class, 'beatmap_id');
diff --git a/app/Models/ChangelogEntry.php b/app/Models/ChangelogEntry.php
index 194a87238c7..4a377b2b8ef 100644
--- a/app/Models/ChangelogEntry.php
+++ b/app/Models/ChangelogEntry.php
@@ -39,9 +39,9 @@ class ChangelogEntry extends Model
 
     public static function convertLegacy($changelog)
     {
-        $message = $changelog->message;
-        $splitMessage = static::splitMessage($message);
-        $title = $splitMessage[0];
+        $splitMessage = static::splitMessage($changelog->message);
+        $title = presence($splitMessage[0]);
+        $message = $splitMessage[1];
 
         if ($title === null) {
             $title = $splitMessage[1];
@@ -65,6 +65,13 @@ public static function convertLegacy($changelog)
         ]);
     }
 
+    public static function getDisplayMessage(?string $origMessage): string
+    {
+        $split = static::splitMessage($origMessage);
+
+        return $split[1] === null ? '' : $split[0];
+    }
+
     public static function guessCategory($data)
     {
         static $ignored = [
@@ -125,7 +132,7 @@ public static function importFromGithub($data)
             'category' => static::guessCategory($data),
             'created_at' => Carbon::parse($data['pull_request']['merged_at']),
             'github_pull_request_id' => $data['pull_request']['number'],
-            'message' => $data['pull_request']['body'],
+            'message' => static::getDisplayMessage($data['pull_request']['body']),
             'private' => static::isPrivate($data),
             'title' => $data['pull_request']['title'],
             'type' => static::guessType($data),
@@ -180,21 +187,30 @@ public static function placeholder()
         ]);
     }
 
-    public static function splitMessage($message)
+    /**
+     * Returns array of message split by thematic break (`---`)
+     *
+     * The array length is always two.
+     * If the message is empty, both values will be null.
+     * If there's no thematic break, the second value will be null.
+     */
+    public static function splitMessage($message): array
     {
         if (!present($message)) {
             return [null, null];
         }
 
         static $separator = "\n\n---\n";
-        // prepended with \n\n just in case the message starts with ---\n (blank first part).
-        $message = "\n\n".trim(str_replace("\r\n", "\n", $message));
-        $splitPos = null_if_false(strpos($message, $separator)) ?? strlen($message);
-
-        return [
-            presence(trim(substr($message, 0, $splitPos))),
-            presence(trim(substr($message, $splitPos + strlen($separator)))),
-        ];
+        // Surround with newlines to handle separator at the start/end.
+        $message = "\n\n".trim(strtr($message, ["\r\n" => "\n"]))."\n";
+        $splitPos = strpos($message, $separator);
+
+        return $splitPos === false
+            ? [trim($message), null]
+            : [
+                trim(substr($message, 0, $splitPos)),
+                trim(substr($message, $splitPos + strlen($separator))),
+            ];
     }
 
     public function builds()
@@ -253,21 +269,12 @@ public function githubUrl()
         }
     }
 
-    public function publicMessageHtml()
+    public function messageHtml(): ?string
     {
         return $this->memoize(__FUNCTION__, function () {
-            $message = $this->publicMessage();
+            $message = $this->message;
 
-            if ($message !== null) {
-                return markdown($message, 'changelog_entry');
-            }
-        });
-    }
-
-    public function publicMessage()
-    {
-        return $this->memoize(__FUNCTION__, function () {
-            return static::splitMessage($this->message)[1];
+            return present($message) ? markdown($message, 'changelog_entry') : null;
         });
     }
 }
diff --git a/app/Models/DeletedUser.php b/app/Models/DeletedUser.php
index 56c14151d46..4e1e3252502 100644
--- a/app/Models/DeletedUser.php
+++ b/app/Models/DeletedUser.php
@@ -7,6 +7,7 @@
 
 class DeletedUser extends User
 {
+    public null $team = null;
     public $user_avatar = null;
     public $username = '[deleted user]';
 
diff --git a/app/Models/Event.php b/app/Models/Event.php
index b7e48085928..1a58e0372f3 100644
--- a/app/Models/Event.php
+++ b/app/Models/Event.php
@@ -88,20 +88,14 @@ public static function generate($type, $options)
 
             case 'beatmapsetApprove':
                 $beatmapset = $options['beatmapset'];
-
-                $beatmapsetUrl = e(route('beatmapsets.show', $beatmapset, false));
-                $beatmapsetTitle = e($beatmapset->artist.' - '.$beatmapset->title);
-                $userName = e($beatmapset->user->username);
-                $userUrl = e(route('users.show', $beatmapset->user, false));
+                $beatmapsetParams = static::beatmapsetParams($beatmapset);
+                $userParams = static::userParams($options['beatmapset']->user);
                 $approval = e($beatmapset->status());
 
-                $textCleanBeatmapsetUrl = $GLOBALS['cfg']['app']['url'].$beatmapsetUrl;
-                $textCleanUserUrl = $GLOBALS['cfg']['app']['url'].$userUrl;
-                $textClean = "[{$textCleanBeatmapsetUrl} {$beatmapsetTitle}] by [{$textCleanUserUrl} {$userName}] has just been {$approval}!";
-
+                $template = '%s by %s has just been %s!';
                 $params = [
-                    'text' => "<a href='{$beatmapsetUrl}'>{$beatmapsetTitle}</a> by <b><a href='{$userUrl}'>{$userName}</a></b> has just been {$approval}!",
-                    'text_clean' => $textClean,
+                    'text' => sprintf($template, "<a href='{$beatmapsetParams['url']}'>{$beatmapsetParams['title']}</a>", "<b><a href='{$userParams['url']}'>{$userParams['username']}</a></b>", $approval),
+                    'text_clean' => sprintf($template, "[{$beatmapsetParams['url_clean']} {$beatmapsetParams['title']}]", "[{$userParams['url_clean']} {$userParams['username']}]", $approval),
                     'beatmap_id' => 0,
                     'beatmapset_id' => $beatmapset->getKey(),
                     'user_id' => $beatmapset->user->getKey(),
@@ -113,11 +107,10 @@ public static function generate($type, $options)
 
             case 'beatmapsetDelete':
                 $beatmapset = $options['beatmapset'];
-                $beatmapsetUrl = e(route('beatmapsets.show', $beatmapset, false));
-                $beatmapsetTitle = e($beatmapset->artist.' - '.$beatmapset->title);
+                $beatmapsetParams = static::beatmapsetParams($beatmapset);
 
                 $params = [
-                    'text' => "<a href='{$beatmapsetUrl}'>{$beatmapsetTitle}</a> has been deleted.",
+                    'text' => "<a href='{$beatmapsetParams['url']}'>{$beatmapsetParams['title']}</a> has been deleted.",
                     'beatmapset_id' => $beatmapset->getKey(),
                     'user_id' => $options['user']->getKey(),
                     'private' => false,
@@ -126,6 +119,60 @@ public static function generate($type, $options)
 
                 break;
 
+            case 'beatmapsetRevive':
+                $beatmapset = $options['beatmapset'];
+                $beatmapsetParams = static::beatmapsetParams($beatmapset);
+                $userParams = static::userParams($beatmapset->user);
+
+                $template = '%s has been revived from eternal slumber by %s.';
+                $params = [
+                    'text' => sprintf($template, "<a href='{$beatmapsetParams['url']}'>{$beatmapsetParams['title']}</a>", "<b><a href='{$userParams['url']}'>{$userParams['username']}</a></b>"),
+                    'text_clean' => sprintf($template, "[{$beatmapsetParams['url_clean']} {$beatmapsetParams['title']}]", "[{$userParams['url_clean']} {$userParams['username']}]"),
+                    'beatmapset_id' => $beatmapset->getKey(),
+                    'user_id' => $beatmapset->user->getKey(),
+                    'private' => false,
+                    'epicfactor' => 5,
+                ];
+
+                break;
+
+            case 'beatmapsetUpdate':
+                $beatmapset = $options['beatmapset'];
+                $beatmapsetParams = static::beatmapsetParams($beatmapset);
+                // retrieved separately from options because it doesn't necessarily need to be the same user
+                // as $beatmapset->user in some cases (see: direct guest difficulty update)
+                $user = $options['user'];
+                $userParams = static::userParams($user);
+
+                $template = '%s has updated the beatmap "%s"';
+                $params = [
+                    'text' => sprintf($template, "<b><a href='{$userParams['url']}'>{$userParams['username']}</a></b>", "<a href='{$beatmapsetParams['url']}'>{$beatmapsetParams['title']}</a>"),
+                    'text_clean' => sprintf($template, "[{$userParams['url_clean']} {$userParams['username']}]", "[{$beatmapsetParams['url_clean']} {$beatmapsetParams['title']}]"),
+                    'beatmapset_id' => $beatmapset->getKey(),
+                    'user_id' => $user->getKey(),
+                    'private' => false,
+                    'epicfactor' => 2,
+                ];
+
+                break;
+
+            case 'beatmapsetUpload':
+                $beatmapset = $options['beatmapset'];
+                $beatmapsetParams = static::beatmapsetParams($beatmapset);
+                $userParams = static::userParams($beatmapset->user);
+
+                $template = '%s has submitted a new beatmap "%s"';
+                $params = [
+                    'text' => sprintf($template, "<b><a href='{$userParams['url']}'>{$userParams['username']}</a></b>", "<a href='{$beatmapsetParams['url']}'>{$beatmapsetParams['title']}</a>"),
+                    'text_clean' => sprintf($template, "[{$userParams['url_clean']} {$userParams['username']}]", "[{$beatmapsetParams['url_clean']} {$beatmapsetParams['title']}]"),
+                    'beatmapset_id' => $beatmapset->getKey(),
+                    'user_id' => $beatmapset->user->getKey(),
+                    'private' => false,
+                    'epicfactor' => 4,
+                ];
+
+                break;
+
             case 'usernameChange':
                 $user = static::userParams($options['user']);
                 $oldUsername = e($options['history']->username_last);
@@ -430,10 +477,22 @@ public function scopeRecent($query)
 
     private static function userParams($user)
     {
+        $url = e(route('users.show', $user, false));
         return [
             'id' => $user->getKey(),
             'username' => e($user->username),
-            'url' => e(route('users.show', $user, false)),
+            'url' => $url,
+            'url_clean' => $GLOBALS['cfg']['app']['url'].$url,
+        ];
+    }
+
+    private static function beatmapsetParams($beatmapset)
+    {
+        $url = e(route('beatmapsets.show', $beatmapset, false));
+        return [
+            'title' => e($beatmapset->artist.' - '.$beatmapset->title),
+            'url' => $url,
+            'url_clean' => $GLOBALS['cfg']['app']['url'].$url,
         ];
     }
 }
diff --git a/app/Models/Forum/Forum.php b/app/Models/Forum/Forum.php
index d8875ba8ec6..6fe0daed042 100644
--- a/app/Models/Forum/Forum.php
+++ b/app/Models/Forum/Forum.php
@@ -5,6 +5,7 @@
 
 namespace App\Models\Forum;
 
+use App\Casts\TimestampOrZero;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
@@ -26,7 +27,7 @@
  * @property string $forum_image
  * @property int $forum_last_post_id
  * @property string $forum_last_post_subject
- * @property int $forum_last_post_time
+ * @property \Carbon\Carbon|null $forum_last_post_time
  * @property string $forum_last_poster_colour
  * @property int $forum_last_poster_id
  * @property string $forum_last_poster_name
@@ -67,10 +68,9 @@ class Forum extends Model
         'allow_topic_covers' => 'boolean',
         'enable_indexing' => 'boolean',
         'enable_sigs' => 'boolean',
-        'forum_last_post_time' => 'datetime',
+        'forum_last_post_time' => TimestampOrZero::class,
         'moderator_groups' => 'array',
     ];
-    protected $dateFormat = 'U';
     protected $primaryKey = 'forum_id';
     protected $table = 'phpbb_forums';
 
@@ -242,16 +242,6 @@ public function setForumLastPosterColourAttribute($value)
         $this->attributes['forum_last_poster_colour'] = ltrim($value, '#');
     }
 
-    public function getForumLastPostTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setForumLastPostTimeAttribute($value)
-    {
-        $this->attributes['forum_last_post_time'] = get_timestamp_or_zero($value);
-    }
-
     // feature forum shall have extra features like sorting and voting
     public function isFeatureForum()
     {
diff --git a/app/Models/Forum/Post.php b/app/Models/Forum/Post.php
index 3f1c04ee3cc..c133bde4d13 100644
--- a/app/Models/Forum/Post.php
+++ b/app/Models/Forum/Post.php
@@ -5,6 +5,7 @@
 
 namespace App\Models\Forum;
 
+use App\Casts\TimestampOrZero;
 use App\Exceptions\ModelNotSavedException;
 use App\Jobs\EsDocument;
 use App\Jobs\MarkNotificationsRead;
@@ -48,7 +49,7 @@
  * @property int $post_reported
  * @property string $post_subject
  * @property mixed $post_text
- * @property int $post_time
+ * @property \Carbon\Carbon|null $post_time
  * @property string $post_username
  * @property int $poster_id
  * @property string $poster_ip
@@ -81,8 +82,10 @@ class Post extends Model implements AfterCommit, Indexable, Traits\ReportableInt
     public $timestamps = false;
 
     protected $casts = [
-        'post_edit_locked' => 'boolean',
         'post_approved' => 'boolean',
+        'post_edit_locked' => 'boolean',
+        'post_edit_time' => TimestampOrZero::class,
+        'post_time' => TimestampOrZero::class,
     ];
 
     private $normalizedUsers = [];
@@ -156,26 +159,6 @@ public function getPostEditUserAttribute($value)
         }
     }
 
-    public function setPostTimeAttribute($value)
-    {
-        $this->attributes['post_time'] = get_timestamp_or_zero($value);
-    }
-
-    public function getPostTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setPostEditTimeAttribute($value)
-    {
-        $this->attributes['post_edit_time'] = get_timestamp_or_zero($value);
-    }
-
-    public function getPostEditTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
     /**
      * Gets a preview of the post_text by stripping anything that
      * looks like bbcode or html.
diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php
index 2ad4fd54c62..1ba4dfd154c 100644
--- a/app/Models/Forum/Topic.php
+++ b/app/Models/Forum/Topic.php
@@ -5,6 +5,7 @@
 
 namespace App\Models\Forum;
 
+use App\Casts\TimestampOrZero;
 use App\Jobs\EsDocument;
 use App\Jobs\UpdateUserForumCache;
 use App\Jobs\UpdateUserForumTopicFollows;
@@ -112,8 +113,13 @@ class Topic extends Model implements AfterCommit
 
     protected $casts = [
         'poll_hide_results' => 'boolean',
+        'poll_last_vote' => TimestampOrZero::class,
+        'poll_start' => TimestampOrZero::class,
         'poll_vote_change' => 'boolean',
         'topic_approved' => 'boolean',
+        'topic_last_post_time' => TimestampOrZero::class,
+        'topic_last_view_time' => TimestampOrZero::class,
+        'topic_time' => TimestampOrZero::class,
     ];
 
     public static function createNew($forum, $params, $poll = null)
@@ -225,61 +231,11 @@ public function watches()
         return $this->hasMany(TopicWatch::class);
     }
 
-    public function getPollLastVoteAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setPollLastVoteAttribute($value)
-    {
-        $this->attributes['poll_last_vote'] = get_timestamp_or_zero($value);
-    }
-
     public function getPollLengthDaysAttribute()
     {
         return $this->attributes['poll_length'] / 86400;
     }
 
-    public function getPollStartAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setPollStartAttribute($value)
-    {
-        $this->attributes['poll_start'] = get_timestamp_or_zero($value);
-    }
-
-    public function getTopicLastPostTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setTopicLastPostTimeAttribute($value)
-    {
-        $this->attributes['topic_last_post_time'] = get_timestamp_or_zero($value);
-    }
-
-    public function getTopicLastViewTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setTopicLastViewTimeAttribute($value)
-    {
-        $this->attributes['topic_last_view_time'] = get_timestamp_or_zero($value);
-    }
-
-    public function getTopicTimeAttribute($value)
-    {
-        return get_time_or_null($value);
-    }
-
-    public function setTopicTimeAttribute($value)
-    {
-        $this->attributes['topic_time'] = get_timestamp_or_zero($value);
-    }
-
     public function getTopicFirstPosterColourAttribute($value)
     {
         if (present($value)) {
diff --git a/app/Models/Multiplayer/PlaylistItem.php b/app/Models/Multiplayer/PlaylistItem.php
index 4c8e6175505..4782c1714a5 100644
--- a/app/Models/Multiplayer/PlaylistItem.php
+++ b/app/Models/Multiplayer/PlaylistItem.php
@@ -21,6 +21,7 @@
  * @property int $owner_id
  * @property int|null $playlist_order
  * @property json|null $required_mods
+ * @property bool $freestyle
  * @property Room $room
  * @property int $room_id
  * @property int|null $ruleset_id
@@ -35,6 +36,7 @@ class PlaylistItem extends Model
     protected $casts = [
         'allowed_mods' => 'object',
         'expired' => 'boolean',
+        'freestyle' => 'boolean',
         'required_mods' => 'object',
     ];
 
@@ -64,6 +66,7 @@ public static function fromJsonParams(User $owner, $json)
             $obj->$field = $value;
         }
 
+        $obj->freestyle = get_bool($json['freestyle'] ?? false);
         $obj->max_attempts = get_int($json['max_attempts'] ?? null);
 
         $modsHelper = app('mods');
@@ -169,6 +172,13 @@ private function assertValidRuleset()
 
     private function assertValidMods()
     {
+        if ($this->freestyle) {
+            if (count($this->allowed_mods) !== 0 || count($this->required_mods) !== 0) {
+                throw new InvariantException("mod isn't allowed in freestyle");
+            }
+            return;
+        }
+
         $allowedModIds = array_column($this->allowed_mods, 'acronym');
         $requiredModIds = array_column($this->required_mods, 'acronym');
 
diff --git a/app/Models/Multiplayer/Room.php b/app/Models/Multiplayer/Room.php
index 8ea4ebc3674..47e6dcad85e 100644
--- a/app/Models/Multiplayer/Room.php
+++ b/app/Models/Multiplayer/Room.php
@@ -6,6 +6,7 @@
 namespace App\Models\Multiplayer;
 
 use App\Casts\PresentString;
+use App\Exceptions\AuthorizationException;
 use App\Exceptions\InvariantException;
 use App\Models\Beatmap;
 use App\Models\Chat\Channel;
@@ -77,6 +78,7 @@ class Room extends Model
     const PLAYLIST_QUEUE_MODE = 'host_only';
     const REALTIME_DEFAULT_QUEUE_MODE = 'host_only';
     const REALTIME_QUEUE_MODES = [ 'host_only', 'all_players', 'all_players_round_robin' ];
+    const REALTIME_STATUSES = ['idle', 'playing'];
 
     public ?array $preloadedRecentParticipants = null;
 
@@ -149,6 +151,7 @@ public static function search(array $rawParams, ?int $maxLimit = null)
             'mode',
             'season_id:int',
             'sort',
+            'status',
             'type_group',
             'user:any',
         ], ['null_missing' => true]);
@@ -157,6 +160,7 @@ public static function search(array $rawParams, ?int $maxLimit = null)
         $user = $params['user'];
         $seasonId = $params['season_id'];
         $sort = $params['sort'];
+        $status = $params['status'];
         $category = $params['category'];
         $typeGroup = $params['type_group'];
 
@@ -173,6 +177,14 @@ public static function search(array $rawParams, ?int $maxLimit = null)
 
         $query = static::whereIn('type', static::TYPE_GROUPS[$typeGroup]);
 
+        if (!in_array($status, static::REALTIME_STATUSES, true)) {
+            $status = null;
+        }
+
+        if (isset($status)) {
+            $query->where('status', $status);
+        }
+
         if (isset($seasonId)) {
             $query->whereRelation('seasons', 'seasons.id', $seasonId);
         }
@@ -321,6 +333,17 @@ public function scopeWithRecentParticipantIds($query, ?int $limit = null)
         ", 'recent_participant_ids');
     }
 
+    public function assertCorrectPassword(?string $password): void
+    {
+        if ($this->password === null) {
+            return;
+        }
+
+        if ($password === null || !hash_equals(hash('sha256', $this->password), hash('sha256', $password))) {
+            throw new AuthorizationException(osu_trans('multiplayer.room.invalid_password'));
+        }
+    }
+
     public function difficultyRange()
     {
         $extraQuery = true;
@@ -647,13 +670,25 @@ public function endGame(User $requestingUser)
         $this->save();
     }
 
-    public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId)
+    public function startPlay(User $user, PlaylistItem $playlistItem, array $rawParams): ScoreToken
     {
         priv_check_user($user, 'MultiplayerScoreSubmit', $this)->ensureCan();
 
-        $this->assertValidStartPlay($user, $playlistItem);
+        $params = get_params($rawParams, null, [
+            'beatmap_hash',
+            'beatmap_id:int',
+            'build_id',
+            'ruleset_id:int',
+        ], ['null_missing' => true]);
+
+        if (!$playlistItem->freestyle) {
+            $params['beatmap_id'] = $playlistItem->beatmap_id;
+            $params['ruleset_id'] = $playlistItem->ruleset_id;
+        }
 
-        return $this->getConnection()->transaction(function () use ($buildId, $user, $playlistItem) {
+        $this->assertValidStartPlay($user, $playlistItem, $params);
+
+        return $this->getConnection()->transaction(function () use ($params, $playlistItem, $user) {
             $agg = UserScoreAggregate::new($user, $this);
             if ($agg->wasRecentlyCreated) {
                 $this->incrementInstance('participant_count');
@@ -665,10 +700,11 @@ public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId)
             $playlistItemAgg->updateUserAttempts();
 
             return ScoreToken::create([
-                'beatmap_id' => $playlistItem->beatmap_id,
-                'build_id' => $buildId,
+                'beatmap_hash' => $params['beatmap_hash'],
+                'beatmap_id' => $params['beatmap_id'],
+                'build_id' => $params['build_id'],
                 'playlist_item_id' => $playlistItem->getKey(),
-                'ruleset_id' => $playlistItem->ruleset_id,
+                'ruleset_id' => $params['ruleset_id'],
                 'user_id' => $user->getKey(),
             ]);
         });
@@ -676,7 +712,7 @@ public function startPlay(User $user, PlaylistItem $playlistItem, int $buildId)
 
     public function topScores()
     {
-        return $this->userHighScores()->forRanking()->with('user.country');
+        return $this->userHighScores()->forRanking()->with(['user.country', 'user.team']);
     }
 
     private function assertHostRoomAllowance()
@@ -729,7 +765,7 @@ private function assertValidStartGame()
         }
     }
 
-    private function assertValidStartPlay(User $user, PlaylistItem $playlistItem)
+    private function assertValidStartPlay(User $user, PlaylistItem $playlistItem, array $params): void
     {
         // todo: check against room's end time (to see if player has enough time to play this beatmap) and is under the room's max attempts limit
 
@@ -737,6 +773,13 @@ private function assertValidStartPlay(User $user, PlaylistItem $playlistItem)
             throw new InvariantException('Room has already ended.');
         }
 
+        if ($playlistItem->freestyle) {
+            // assert the beatmap_id is part of playlist item's beatmapset
+            if ($playlistItem->beatmap->beatmapset_id !== Beatmap::find($params['beatmap_id'])?->beatmapset_id) {
+                throw new InvariantException('Specified beatmap_id is not allowed');
+            }
+        }
+
         $userId = $user->getKey();
         if ($this->max_attempts !== null) {
             $roomStats = $this->userHighScores()->where('user_id', $userId)->first();
diff --git a/app/Models/ScoreToken.php b/app/Models/ScoreToken.php
index f75c4bb07c5..5427c55b505 100644
--- a/app/Models/ScoreToken.php
+++ b/app/Models/ScoreToken.php
@@ -5,6 +5,7 @@
 
 namespace App\Models;
 
+use App\Exceptions\InvariantException;
 use App\Models\Multiplayer\PlaylistItem;
 use App\Models\Solo\Score;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -25,6 +26,8 @@
  */
 class ScoreToken extends Model
 {
+    public ?string $beatmapHash = null;
+
     public function beatmap()
     {
         return $this->belongsTo(Beatmap::class, 'beatmap_id');
@@ -74,4 +77,34 @@ public function getAttribute($key)
             'user' => $this->getRelationValue($key),
         };
     }
+
+    public function setBeatmapHashAttribute(?string $value): void
+    {
+        $this->beatmapHash = $value;
+    }
+
+    public function assertValid(): void
+    {
+        $beatmap = $this->beatmap;
+        if ($this->beatmapHash !== $beatmap->checksum) {
+            throw new InvariantException(osu_trans('score_tokens.create.beatmap_hash_invalid'));
+        }
+
+        $rulesetId = $this->ruleset_id;
+        if ($rulesetId === null) {
+            throw new InvariantException('missing ruleset_id');
+        }
+        if (Beatmap::modeStr($rulesetId) === null || !$beatmap->canBeConvertedTo($rulesetId)) {
+            throw new InvariantException('invalid ruleset_id');
+        }
+    }
+
+    public function save(array $options = []): bool
+    {
+        if (!$this->exists) {
+            $this->assertValid();
+        }
+
+        return parent::save($options);
+    }
 }
diff --git a/app/Models/Solo/Score.php b/app/Models/Solo/Score.php
index 690341baa64..b02a6ce54ad 100644
--- a/app/Models/Solo/Score.php
+++ b/app/Models/Solo/Score.php
@@ -52,7 +52,13 @@
  */
 class Score extends Model implements Traits\ReportableInterface
 {
-    use Traits\Reportable, Traits\WithWeightedPp;
+    use Traits\Reportable, Traits\WithDbCursorHelper, Traits\WithWeightedPp;
+
+    const DEFAULT_SORT = 'old';
+
+    const SORTS = [
+        'old' => [['column' => 'id', 'order' => 'ASC']],
+    ];
 
     public $timestamps = false;
 
@@ -163,6 +169,18 @@ public function scopeDefault(Builder $query): Builder
         return $query->whereHas('beatmap.beatmapset');
     }
 
+    /**
+     * This should only be sorted by primary key(s)
+     */
+    public function scopeForListing(Builder $query): Builder
+    {
+        return $query->where('ranked', true)
+            ->whereHas('user', fn ($q) => $q->default())
+            ->from(\DB::raw("{$this->getTable()} FORCE INDEX (PRIMARY)"))
+            ->leftJoinRelation('processHistory')
+            ->select([$query->qualifyColumn('*'), 'processed_version']);
+    }
+
     public function scopeForRuleset(Builder $query, string $ruleset): Builder
     {
         return $query->where('ruleset_id', Beatmap::MODES[$ruleset]);
@@ -364,6 +382,19 @@ public function isPerfectLegacyCombo(): ?bool
         return null;
     }
 
+    public function isProcessed(): bool
+    {
+        if ($this->legacy_score_id !== null) {
+            return true;
+        }
+
+        if (array_key_exists('processed_version', $this->attributes)) {
+            return $this->attributes['processed_version'] !== null;
+        }
+
+        return $this->processHistory !== null;
+    }
+
     public function legacyScore(): ?LegacyScore\Best\Model
     {
         $id = $this->legacy_score_id;
diff --git a/app/Models/Spotlight.php b/app/Models/Spotlight.php
index 3fe43f972db..1c470a04442 100644
--- a/app/Models/Spotlight.php
+++ b/app/Models/Spotlight.php
@@ -96,7 +96,7 @@ public function ranking(string $mode)
         // These models will not have the correct table name set on them
         // as they get overriden when Laravel hydrates them.
         return $this->userStats($mode)
-            ->with(['user', 'user.country'])
+            ->with(['user', 'user.country', 'user.team'])
             ->whereHas('user', function ($userQuery) {
                 $model = new User();
                 $userQuery
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index 3513ab3d891..92134fa99ad 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -22,20 +22,4 @@ public function beatmapTags(): HasMany
     {
         return $this->hasMany(BeatmapTag::class);
     }
-
-    public static function topTags($beatmapId)
-    {
-        return static
-            ::joinRelation(
-                'beatmapTags',
-                fn ($q) => $q->where('beatmap_id', $beatmapId)->whereHas('user', fn ($userQuery) => $userQuery->default())
-            )
-            ->groupBy('id')
-            ->select('id', 'name')
-            ->selectRaw('COUNT(*) as count')
-            ->orderBy('count', 'desc')
-            ->orderBy('id', 'desc')
-            ->limit(50)
-            ->get();
-    }
 }
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 00b2be5d963..33437a2774f 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -9,6 +9,7 @@
 
 use App\Libraries\BBCodeForDB;
 use App\Libraries\Uploader;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Team extends Model
@@ -51,6 +52,21 @@ public function setLogoAttribute(?string $value): void
         }
     }
 
+    public function setDefaultRulesetIdAttribute(?int $value): void
+    {
+        $this->attributes['default_ruleset_id'] = Beatmap::MODES[Beatmap::modeStr($value) ?? 'osu'];
+    }
+
+    public function setUrlAttribute(?string $value): void
+    {
+        $this->attributes['url'] = $value === null
+            ? null
+            : (is_http($value)
+                ? $value
+                : "https://{$value}"
+            );
+    }
+
     public function descriptionHtml(): string
     {
         $description = presence($this->description);
@@ -60,6 +76,22 @@ public function descriptionHtml(): string
             : bbcode((new BBCodeForDB($description))->generate());
     }
 
+    public function delete()
+    {
+        $this->header()->delete();
+        $this->logo()->delete();
+
+        return $this->getConnection()->transaction(function () {
+            $ret = parent::delete();
+
+            if ($ret) {
+                $this->members()->delete();
+            }
+
+            return $ret;
+        });
+    }
+
     public function header(): Uploader
     {
         return $this->header ??= new Uploader(
@@ -70,13 +102,33 @@ public function header(): Uploader
         );
     }
 
+    public function isValid(): bool
+    {
+        $this->validationErrors()->reset();
+
+        if ($this->isDirty('url')) {
+            $url = $this->url;
+            if ($url !== null && !is_http($url)) {
+                $this->validationErrors()->add('url', 'url');
+            }
+        }
+
+        if ($this->isDirty('ruleset_id')) {
+            if (Beatmap::modeStr($this->ruleset_id) === null) {
+                $this->validationErrors()->add('ruleset_id', '.unknown_ruleset_id');
+            }
+        }
+
+        return $this->validationErrors()->isEmpty();
+    }
+
     public function logo(): Uploader
     {
         return $this->logo ??= new Uploader(
             'teams/logo',
             $this,
             'logo_file',
-            ['image' => ['maxDimensions' => [256, 128]]],
+            ['image' => ['maxDimensions' => [512, 256]]],
         );
     }
 }
diff --git a/app/Models/TeamMember.php b/app/Models/TeamMember.php
index d2510426fa1..84030ee2257 100644
--- a/app/Models/TeamMember.php
+++ b/app/Models/TeamMember.php
@@ -24,4 +24,13 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id');
     }
+
+    public function userOrDeleted(): User
+    {
+        $user = $this->user;
+
+        return $user === null || $user->isRestricted()
+            ? new DeletedUser(['user_id' => $this->user_id])
+            : $user;
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 306f4710502..3c9f96e8fa4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -37,6 +37,7 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\QueryException;
 use Laravel\Passport\HasApiTokens;
 use League\OAuth2\Server\Exception\OAuthServerException;
@@ -127,7 +128,7 @@
  * @property-read Collection<Store\Address> $storeAddresses
  * @property-read Collection<UserDonation> $supporterTagPurchases
  * @property-read Collection<UserDonation> $supporterTags
- * @property-read TeamMember|null $teamMembership
+ * @property-read Team|null $team
  * @property-read Collection<OAuth\Token> $tokens
  * @property-read Collection<Forum\TopicWatch> $topicWatches
  * @property-read Collection<UserAchievement> $userAchievements
@@ -297,9 +298,16 @@ public function userCountryHistory(): HasMany
         return $this->hasMany(UserCountryHistory::class);
     }
 
-    public function teamMembership(): HasOne
+    public function team(): HasOneThrough
     {
-        return $this->hasOne(TeamMember::class, 'user_id');
+        return $this->hasOneThrough(
+            Team::class,
+            TeamMember::class,
+            'user_id',
+            'id',
+            'user_id',
+            'team_id',
+        );
     }
 
     public function getAuthPassword()
@@ -309,24 +317,23 @@ public function getAuthPassword()
 
     public function usernameChangeCost()
     {
-        $changesToDate = $this->usernameChangeHistory()
-            ->whereIn('type', ['support', 'paid'])
-            ->count();
+        $tier = min($this->usernameChangeHistory()->paid()->count(), 5);
 
-        switch ($changesToDate) {
-            case 0:
-                return 0;
-            case 1:
-                return 8;
-            case 2:
-                return 16;
-            case 3:
-                return 32;
-            case 4:
-                return 64;
-            default:
-                return 100;
+        if ($tier > 1) {
+            $lastChange = $this->usernameChangeHistory()->paid()->last()?->timestamp;
+            if ($lastChange !== null) {
+                $tier = max($tier - $lastChange->diffInYears(Carbon::now(), false), 1);
+            }
         }
+
+        return match ($tier) {
+            0 => 0,
+            1 => 8,
+            2 => 16,
+            3 => 32,
+            4 => 64,
+            default => 100,
+        };
     }
 
     public function revertUsername($type = 'revert'): UsernameChangeHistory
@@ -958,7 +965,7 @@ public function getAttribute($key)
             'storeAddresses',
             'supporterTagPurchases',
             'supporterTags',
-            'teamMembership',
+            'team',
             'tokens',
             'topicWatches',
             'userAchievements',
@@ -2031,6 +2038,16 @@ public function scopeOnline($query)
             ->where('user_lastvisit', '>', time() - $GLOBALS['cfg']['osu']['user']['online_window']);
     }
 
+    public function scopeWithoutBots(Builder $query): Builder
+    {
+        return $query->whereNot('group_id', app('groups')->byIdentifier('bot')->getKey());
+    }
+
+    public function scopeWithoutNoProfile(Builder $query): Builder
+    {
+        return $query->whereNot('group_id', app('groups')->byIdentifier('no_profile')->getKey());
+    }
+
     public function checkPassword($password)
     {
         return Hash::check($password, $this->getAuthPassword());
@@ -2120,8 +2137,10 @@ public static function attemptLogin($user, $password, $ip = null)
 
     public static function findForLogin($username, $allowEmail = false)
     {
-        if (!present($username)) {
-            return;
+        $username = trim($username ?? '');
+
+        if ($username === null) {
+            return null;
         }
 
         $query = static::where('username', $username);
diff --git a/app/Models/UsernameChangeHistory.php b/app/Models/UsernameChangeHistory.php
index 2711b5bf326..abcdc26a5fe 100644
--- a/app/Models/UsernameChangeHistory.php
+++ b/app/Models/UsernameChangeHistory.php
@@ -21,6 +21,11 @@ class UsernameChangeHistory extends Model
     protected $table = 'osu_username_change_history';
     protected $primaryKey = 'change_id';
 
+    public function scopePaid($query)
+    {
+        $query->whereIn('type', ['support', 'paid']); // changed by support counts as paid.
+    }
+
     public function scopeVisible($query)
     {
         $query->whereIn('type', ['support', 'paid', 'admin']);
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index bd080bdcae9..7d358070636 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -31,6 +31,7 @@ class AppServiceProvider extends ServiceProvider
         'layout-cache' => Singletons\LayoutCache::class,
         'medals' => Singletons\Medals::class,
         'smilies' => Singletons\Smilies::class,
+        'tags' => Singletons\Tags::class,
         'user-cover-presets' => Singletons\UserCoverPresets::class,
     ];
 
diff --git a/app/Singletons/OsuAuthorize.php b/app/Singletons/OsuAuthorize.php
index 09a2e135692..de5e189746b 100644
--- a/app/Singletons/OsuAuthorize.php
+++ b/app/Singletons/OsuAuthorize.php
@@ -29,6 +29,7 @@
 use App\Models\OAuth\Client;
 use App\Models\Score\Best\Model as ScoreBest;
 use App\Models\Solo;
+use App\Models\Team;
 use App\Models\Traits\ReportableInterface;
 use App\Models\User;
 use App\Models\UserContestEntry;
@@ -47,9 +48,10 @@ public static function alwaysCheck($ability)
 
         $set ??= new Ds\Set([
             'ContestJudge',
-            'IsOwnClient',
             'IsNotOAuth',
+            'IsOwnClient',
             'IsSpecialScope',
+            'TeamPart',
             'UserUpdateEmail',
         ]);
 
@@ -1026,7 +1028,7 @@ public function checkChatChannelRead(?User $user, Channel $channel): string
      * @return string
      * @throws AuthorizationCheckException
      */
-    public function checkChatChannelJoin(?User $user, Channel $channel): string
+    public function checkChatChannelJoin(?User $user, Channel $channel): ?string
     {
         $prefix = 'chat.';
 
@@ -1038,13 +1040,9 @@ public function checkChatChannelJoin(?User $user, Channel $channel): string
 
         $this->ensureCleanRecord($user, $prefix);
 
-        // This check is only for when joining the channel directly; joining via the Room
-        // will always add the user to the channel.
+        // joining multiplayer room is done through room endpoint
         if ($channel->isMultiplayer()) {
-            $room = Room::hasParticipated($user)->find($channel->room_id);
-            if ($room !== null) {
-                return 'ok';
-            }
+            return null;
         }
 
         // allow joining of 'tournament' matches (for lazer/tournament client)
@@ -1907,6 +1905,29 @@ public function checkScorePin(?User $user, ScoreBest|Solo\Score $score): string
         return 'ok';
     }
 
+    public function checkTeamPart(?User $user, Team $team): ?string
+    {
+        $this->ensureLoggedIn($user);
+
+        $prefix = 'team.part.';
+
+        if ($team->leader_id === $user->getKey()) {
+            return $prefix.'is_leader';
+        }
+        if ($team->getKey() !== $user?->team?->getKey()) {
+            return $prefix.'not_member';
+        }
+
+        return 'ok';
+    }
+
+    public function checkTeamUpdate(?User $user, Team $team): ?string
+    {
+        $this->ensureLoggedIn($user);
+
+        return $team->leader_id === $user->getKey() ? 'ok' : null;
+    }
+
     public function checkUserGroupEventShowActor(?User $user, UserGroupEvent $event): string
     {
         if ($user?->isGroup($event->group)) {
diff --git a/app/Singletons/Tags.php b/app/Singletons/Tags.php
new file mode 100644
index 00000000000..589bad8b557
--- /dev/null
+++ b/app/Singletons/Tags.php
@@ -0,0 +1,44 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Singletons;
+
+use App\Models\Tag;
+use App\Traits\Memoizes;
+use App\Transformers\TagTransformer;
+use Illuminate\Support\Collection;
+
+class Tags
+{
+    use Memoizes;
+
+    /**
+     * @return Collection<Tag>
+     */
+    public function all(): Collection
+    {
+        return $this->memoize(__FUNCTION__, fn () => Tag::all());
+    }
+
+    public function get(int $id): ?Tag
+    {
+        $allById = $this->memoize(
+            'allById',
+            fn () => $this->all()->keyBy('id'),
+        );
+
+        return $allById[$id] ?? null;
+    }
+
+    public function json(): array
+    {
+        return $this->memoize(
+            __FUNCTION__,
+            fn () => json_collection($this->all(), new TagTransformer()),
+        );
+    }
+}
diff --git a/app/Transformers/BeatmapCompactTransformer.php b/app/Transformers/BeatmapCompactTransformer.php
index ef8a96c6542..9ec4aa198c3 100644
--- a/app/Transformers/BeatmapCompactTransformer.php
+++ b/app/Transformers/BeatmapCompactTransformer.php
@@ -18,6 +18,7 @@ class BeatmapCompactTransformer extends TransformerAbstract
         'failtimes',
         'max_combo',
         'owners',
+        'top_tag_ids',
         'user',
     ];
 
@@ -83,6 +84,11 @@ public function includeOwners(Beatmap $beatmap)
         ]);
     }
 
+    public function includeTopTagIds(Beatmap $beatmap)
+    {
+        return $this->primitive($beatmap->topTagIds());
+    }
+
     public function includeUser(Beatmap $beatmap)
     {
         return $this->item(
diff --git a/app/Transformers/BeatmapsetCompactTransformer.php b/app/Transformers/BeatmapsetCompactTransformer.php
index 546fe4125fe..f4f95e18cfd 100644
--- a/app/Transformers/BeatmapsetCompactTransformer.php
+++ b/app/Transformers/BeatmapsetCompactTransformer.php
@@ -40,6 +40,7 @@ class BeatmapsetCompactTransformer extends TransformerAbstract
         'ratings',
         'recent_favourites',
         'related_users',
+        'related_tags',
         'user',
     ];
 
@@ -299,6 +300,24 @@ public function includeRelatedUsers(Beatmapset $beatmapset)
         return $this->collection($users, new UserCompactTransformer());
     }
 
+    public function includeRelatedTags(Beatmapset $beatmapset)
+    {
+        $beatmaps = $this->beatmaps($beatmapset);
+        $tagIdSet = new Set($beatmaps->flatMap->topTagIds()->pluck('tag_id'));
+
+        $cachedTags = app('tags');
+        $json = [];
+
+        foreach ($tagIdSet as $tagId) {
+            $tag = $cachedTags->get($tagId);
+            if ($tag !== null) {
+                $json[] = $tag;
+            }
+        }
+
+        return $this->primitive($json);
+    }
+
     private function beatmaps(Beatmapset $beatmapset, ?Fractal\ParamBag $params = null): EloquentCollection
     {
         $rel = $beatmapset->trashed() || ($params !== null && $params->get('with_trashed')) ? 'allBeatmaps' : 'beatmaps';
diff --git a/app/Transformers/ChangelogEntryTransformer.php b/app/Transformers/ChangelogEntryTransformer.php
index f11f9091f63..0d190c36b24 100644
--- a/app/Transformers/ChangelogEntryTransformer.php
+++ b/app/Transformers/ChangelogEntryTransformer.php
@@ -39,11 +39,11 @@ public function includeGithubUser(ChangelogEntry $entry)
 
     public function includeMessage(ChangelogEntry $entry)
     {
-        return $this->primitive($entry->publicMessage());
+        return $this->primitive($entry->message);
     }
 
     public function includeMessageHtml(ChangelogEntry $entry)
     {
-        return $this->primitive($entry->publicMessageHtml());
+        return $this->primitive($entry->messageHtml());
     }
 }
diff --git a/app/Transformers/CurrentUserTransformer.php b/app/Transformers/CurrentUserTransformer.php
index 6e89c338df2..beccb8c54b2 100644
--- a/app/Transformers/CurrentUserTransformer.php
+++ b/app/Transformers/CurrentUserTransformer.php
@@ -16,6 +16,7 @@ public function __construct()
             'friends',
             'groups',
             'is_admin',
+            'team',
             'unread_pm_count',
             'user_preferences',
         ];
diff --git a/app/Transformers/Multiplayer/PlaylistItemTransformer.php b/app/Transformers/Multiplayer/PlaylistItemTransformer.php
index 99cd7f98d83..f7b331b05e9 100644
--- a/app/Transformers/Multiplayer/PlaylistItemTransformer.php
+++ b/app/Transformers/Multiplayer/PlaylistItemTransformer.php
@@ -24,6 +24,7 @@ public function transform(PlaylistItem $item)
             'ruleset_id' => $item->ruleset_id,
             'allowed_mods' => $item->allowed_mods,
             'required_mods' => $item->required_mods,
+            'freestyle' => $item->freestyle,
             'expired' => $item->expired,
             'owner_id' => $item->owner_id,
             'playlist_order' => $item->playlist_order,
diff --git a/app/Transformers/Multiplayer/RoomTransformer.php b/app/Transformers/Multiplayer/RoomTransformer.php
index c96cae14b56..cc3d0cf93c1 100644
--- a/app/Transformers/Multiplayer/RoomTransformer.php
+++ b/app/Transformers/Multiplayer/RoomTransformer.php
@@ -23,6 +23,26 @@ class RoomTransformer extends TransformerAbstract
         'recent_participants',
     ];
 
+    public static function createShowResponse(Room $room): array
+    {
+        return json_item(
+            $room->loadMissing([
+                'host',
+                'playlist.beatmap.baseMaxCombo',
+                'playlist.beatmap.beatmapset',
+            ]),
+            new static(),
+            [
+                'current_user_score.playlist_item_attempts',
+                'host.country',
+                'playlist.beatmap.beatmapset',
+                'playlist.beatmap.checksum',
+                'playlist.beatmap.max_combo',
+                'recent_participants',
+            ],
+        );
+    }
+
     public function transform(Room $room)
     {
         return [
diff --git a/app/Transformers/ScoreTransformer.php b/app/Transformers/ScoreTransformer.php
index 6ab3cc8f2f5..59330f87334 100644
--- a/app/Transformers/ScoreTransformer.php
+++ b/app/Transformers/ScoreTransformer.php
@@ -105,7 +105,7 @@ public function transformSolo(MultiplayerScoreLink|ScoreModel|SoloScore $score)
         if ($score instanceof SoloScore) {
             $extraAttributes['classic_total_score'] = $score->getClassicTotalScore();
             $extraAttributes['preserve'] = $score->preserve;
-            $extraAttributes['processed'] = $score->legacy_score_id !== null || $score->processHistory !== null;
+            $extraAttributes['processed'] = $score->isProcessed();
             $extraAttributes['ranked'] = $score->ranked;
         }
 
diff --git a/app/Transformers/TeamTransformer.php b/app/Transformers/TeamTransformer.php
new file mode 100644
index 00000000000..e2e1bb15055
--- /dev/null
+++ b/app/Transformers/TeamTransformer.php
@@ -0,0 +1,23 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace App\Transformers;
+
+use App\Models\Team;
+
+class TeamTransformer extends TransformerAbstract
+{
+    public function transform(Team $team): array
+    {
+        return [
+            'id' => $team->getKey(),
+            'logo' => $team->logo()->url(),
+            'name' => $team->name,
+            'short_name' => $team->short_name,
+        ];
+    }
+}
diff --git a/app/Transformers/UserCompactTransformer.php b/app/Transformers/UserCompactTransformer.php
index 21df9c260e5..e18c90cf8f3 100644
--- a/app/Transformers/UserCompactTransformer.php
+++ b/app/Transformers/UserCompactTransformer.php
@@ -19,9 +19,11 @@ class UserCompactTransformer extends TransformerAbstract
         'country',
         'cover',
         'groups',
+        'team',
     ];
 
     const CARD_INCLUDES_PRELOAD = [
+        'team',
         'userGroups',
     ];
 
@@ -92,6 +94,7 @@ class UserCompactTransformer extends TransformerAbstract
         'statistics',
         'statistics_rulesets',
         'support_level',
+        'team',
         'unread_pm_count',
         'user_achievements',
         'user_preferences',
@@ -454,6 +457,13 @@ public function includeSupportLevel(User $user)
         return $this->primitive($user->supportLevel());
     }
 
+    public function includeTeam(User $user)
+    {
+        return ($team = $user->team) === null
+            ? $this->null()
+            : $this->item($team, new TeamTransformer());
+    }
+
     public function includeUnreadPmCount(User $user)
     {
         // legacy pm has been turned off
diff --git a/app/helpers.php b/app/helpers.php
index 5258929f7f3..5960595cd21 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -55,15 +55,11 @@ function atom_id(string $namespace, $id = null): string
     return 'tag:'.request()->getHttpHost().',2019:'.$namespace.($id === null ? '' : "/{$id}");
 }
 
-function background_image($url, $proxy = true)
+function background_image($url): string
 {
-    if (!present($url)) {
-        return '';
-    }
-
-    $url = $proxy ? proxy_media($url) : $url;
-
-    return sprintf(' style="background-image:url(\'%s\');" ', e($url));
+    return present($url)
+        ? sprintf(' style="background-image:url(\'%s\');" ', e($url))
+        : '';
 }
 
 function beatmap_timestamp_format($ms)
@@ -594,11 +590,6 @@ function max_offset($page, $limit)
     return max(0, min($offset, $GLOBALS['cfg']['osu']['pagination']['max_count'] - $limit));
 }
 
-function mysql_escape_like($string)
-{
-    return addcslashes($string, '%_\\');
-}
-
 function oauth_token(): ?App\Models\OAuth\Token
 {
     return Request::instance()->attributes->get(App\Http\Middleware\AuthApi::REQUEST_OAUTH_TOKEN_KEY);
@@ -845,7 +836,9 @@ function forum_user_link(int $id, string $username, string|null $colour, int|nul
 
 function is_api_request(): bool
 {
-    return str_starts_with(rawurldecode(Request::getPathInfo()), '/api/');
+    $url = rawurldecode(Request::getPathInfo());
+    return str_starts_with($url, '/api/')
+        || str_starts_with($url, '/_lio/');
 }
 
 function is_http(string $url): bool
@@ -1689,27 +1682,6 @@ function model_pluck($builder, $key, $class = null)
     return $result;
 }
 
-/*
- * Returns null if $timestamp is null or 0.
- * Used for table which has not null constraints but accepts "empty" value (0).
- */
-function get_time_or_null($timestamp)
-{
-    if ($timestamp !== 0) {
-        return parse_time_to_carbon($timestamp);
-    }
-}
-
-/*
- * Get unix timestamp of a DateTime (or Carbon\Carbon).
- * Returns 0 if $time is null so mysql doesn't explode because of not null
- * constraints.
- */
-function get_timestamp_or_zero(DateTime $time = null): int
-{
-    return $time === null ? 0 : $time->getTimestamp();
-}
-
 function null_if_false($value)
 {
     return $value === false ? null : $value;
@@ -1744,6 +1716,10 @@ function parse_time_to_carbon($value)
     if ($value instanceof DateTime) {
         return Carbon\Carbon::instance($value);
     }
+
+    if ($value instanceof Carbon\CarbonImmutable) {
+        return $value->toMutable();
+    }
 }
 
 function format_duration_for_display(int $seconds)
diff --git a/composer.lock b/composer.lock
index a2e9c5b6e3c..97ce1ad5739 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3583,16 +3583,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.3",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
-                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932",
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932",
                 "shasum": ""
             },
             "require": {
@@ -3617,8 +3617,9 @@
                 "phpstan/phpstan": "^1.8.2",
                 "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0 || ^7.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 || ^7.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -3628,7 +3629,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.6-dev"
+                    "dev-main": "2.7-dev"
                 }
             },
             "autoload": {
@@ -3685,7 +3686,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-16T11:46:16+00:00"
+            "time": "2024-12-07T15:34:16+00:00"
         },
         {
             "name": "league/config",
@@ -5059,16 +5060,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.72.5",
+            "version": "2.72.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed"
+                "url": "https://github.com/CarbonPHP/carbon.git",
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed",
-                "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5",
+                "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5",
                 "shasum": ""
             },
             "require": {
@@ -5088,7 +5089,7 @@
                 "doctrine/orm": "^2.7 || ^3.0",
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
+                "ondrejmirtes/better-reflection": "<6",
                 "phpmd/phpmd": "^2.9",
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^0.12.99 || ^1.7.14",
@@ -5101,10 +5102,6 @@
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev",
-                    "dev-2.x": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -5114,6 +5111,10 @@
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -5162,7 +5163,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-03T19:18:41+00:00"
+            "time": "2024-12-27T09:28:11+00:00"
         },
         {
             "name": "nette/schema",
@@ -8072,16 +8073,16 @@
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197"
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
-                "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
                 "shasum": ""
             },
             "require": {
@@ -8090,12 +8091,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8128,7 +8129,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8144,7 +8145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/console",
@@ -8307,16 +8308,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
-                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
                 "shasum": ""
             },
             "require": {
@@ -8324,12 +8325,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8354,7 +8355,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8370,7 +8371,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -8529,16 +8530,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
-                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
                 "shasum": ""
             },
             "require": {
@@ -8547,12 +8548,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8585,7 +8586,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8601,7 +8602,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/finder",
@@ -8762,16 +8763,16 @@
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d"
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
                 "shasum": ""
             },
             "require": {
@@ -8779,12 +8780,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -8820,7 +8821,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
             },
             "funding": [
                 {
@@ -8836,7 +8837,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-12-07T08:49:48+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -9608,8 +9609,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9682,8 +9683,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -10132,16 +10133,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f"
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
-                "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
                 "shasum": ""
             },
             "require": {
@@ -10154,12 +10155,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -10195,7 +10196,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -10211,7 +10212,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/string",
@@ -10397,16 +10398,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a"
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
-                "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
                 "shasum": ""
             },
             "require": {
@@ -10414,12 +10415,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -10455,7 +10456,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -10471,7 +10472,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/uid",
diff --git a/config/osu.php b/config/osu.php
index 0bf47f7b8c4..de037d65fbd 100644
--- a/config/osu.php
+++ b/config/osu.php
@@ -189,6 +189,7 @@
         'es_cache_duration' => 60 * (get_float(env('SCORES_ES_CACHE_DURATION')) ?? 0.5), // in minutes, converted to seconds
         'experimental_rank_as_default' => get_bool(env('SCORES_EXPERIMENTAL_RANK_AS_DEFAULT')) ?? false,
         'experimental_rank_as_extra' => get_bool(env('SCORES_EXPERIMENTAL_RANK_AS_EXTRA')) ?? false,
+        'index_max_id_distance' => get_int(env('SCORE_INDEX_MAX_ID_DISTANCE')) ?? 10_000_000,
         'processing_queue' => presence(env('SCORES_PROCESSING_QUEUE')) ?? 'osu-queue:score-statistics',
         'submission_enabled' => get_bool(env('SCORES_SUBMISSION_ENABLED')) ?? true,
     ],
diff --git a/database/factories/ScoreTokenFactory.php b/database/factories/ScoreTokenFactory.php
index aa7f4950d14..7c7b85f727a 100644
--- a/database/factories/ScoreTokenFactory.php
+++ b/database/factories/ScoreTokenFactory.php
@@ -23,7 +23,8 @@ public function definition(): array
             'build_id' => Build::factory(),
             'user_id' => User::factory(),
 
-            // depends on beatmap_id
+            // depend on beatmap_id
+            'beatmap_hash' => fn (array $attr) => Beatmap::find($attr['beatmap_id'])->checksum,
             'ruleset_id' => fn (array $attr) => Beatmap::find($attr['beatmap_id'])->playmode,
         ];
     }
diff --git a/database/factories/TagFactory.php b/database/factories/TagFactory.php
index f1bb27b044d..8617d60d431 100644
--- a/database/factories/TagFactory.php
+++ b/database/factories/TagFactory.php
@@ -16,7 +16,7 @@ class TagFactory extends Factory
     public function definition(): array
     {
         return [
-            'name' => fn () => "Tag {$this->faker->word}",
+            'name' => fn () => "Tag {$this->faker->unique()->word}",
             'description' => fn () => $this->faker->sentence,
         ];
     }
diff --git a/database/factories/UsernameChangeHistoryFactory.php b/database/factories/UsernameChangeHistoryFactory.php
new file mode 100644
index 00000000000..7359c941b6c
--- /dev/null
+++ b/database/factories/UsernameChangeHistoryFactory.php
@@ -0,0 +1,31 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\User;
+use App\Models\UsernameChangeHistory;
+use Carbon\Carbon;
+
+class UsernameChangeHistoryFactory extends Factory
+{
+    protected $model = UsernameChangeHistory::class;
+
+    public function definition(): array
+    {
+        return [
+            'timestamp' => Carbon::now(),
+            'type' => 'paid',
+            'user_id' => User::factory(),
+
+            // depend on user_id; the username will be incorrect when factorying multiple names at once,
+            // so they should be handled separately if realistic name changes are wanted.
+            'username' => fn (array $attr) => User::find($attr['user_id'])->username,
+            'username_last' => fn (array $attr) => "{$attr['username']}_prev",
+        ];
+    }
+}
diff --git a/database/migrations/2025_01_06_000000_create_osu_logins.php b/database/migrations/2025_01_06_000000_create_osu_logins.php
new file mode 100644
index 00000000000..6d0840afa43
--- /dev/null
+++ b/database/migrations/2025_01_06_000000_create_osu_logins.php
@@ -0,0 +1,36 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        // This is a legacy table. Migration is added for external projects' sake.
+        if (Schema::hasTable('osu_logins')) {
+            return;
+        }
+
+        Schema::create('osu_logins', function (Blueprint $table) {
+            $table->unsignedInteger('user_id')->default(0);
+            $table->string('ip', 100)->default('');
+            $table->timestamp('date')->useCurrent();
+
+            $table->index('user_id', 'user_id');
+            $table->index('date', 'date');
+            $table->index('ip', 'ip');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('osu_logins');
+    }
+};
diff --git a/database/migrations/2025_01_16_000000_add_freestyle_to_multiplayer_playlist_items.php b/database/migrations/2025_01_16_000000_add_freestyle_to_multiplayer_playlist_items.php
new file mode 100644
index 00000000000..9136afe63b2
--- /dev/null
+++ b/database/migrations/2025_01_16_000000_add_freestyle_to_multiplayer_playlist_items.php
@@ -0,0 +1,33 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('multiplayer_playlist_items', function (Blueprint $table) {
+            $table->boolean('freestyle')->after('required_mods')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('multiplayer_playlist_items', function (Blueprint $table) {
+            $table->dropColumn('freestyle');
+        });
+    }
+};
diff --git a/docker/development/prepare.sh b/docker/development/prepare.sh
index 7f69ea08701..94ba4806019 100755
--- a/docker/development/prepare.sh
+++ b/docker/development/prepare.sh
@@ -15,18 +15,24 @@ _run() {
     docker compose run --rm php "$@"
 }
 
-_run_dusk() {
-    docker compose run --rm -e APP_ENV=dusk.local php "$@"
-}
-
-if [ ! -f .env ]; then
-    echo "Copying default env file"
-    cp .env.example .env
-fi
+for envfile in .env .env.testing .env.dusk.local; do
+    if [ ! -f "${envfile}" ]; then
+        echo "Copying env file '${envfile}'"
+        cp "${envfile}.example" "${envfile}"
+    fi
+    if [ "${envfile}" != .env.testing ] && ! grep -q '^APP_KEY=.' "${envfile}"; then
+        echo "Generating app key for env file '${envfile}'"
+        sed -i -e '/^APP_KEY=.*/d' "${envfile}"
+        : ${APP_KEY="base64:$(head -c 32 /dev/urandom | base64)"}
+        echo "APP_KEY=${APP_KEY}" >> "${envfile}"
+    fi
+done
 
 if [ -n "${GITHUB_TOKEN:-}" ]; then
     _run composer config -g github-oauth.github.com "${GITHUB_TOKEN}"
-    grep ^GITHUB_TOKEN= .env || echo "GITHUB_TOKEN=${GITHUB_TOKEN}" >> .env
+    for envfile in .env .env.dusk.local; do
+        grep -q '^GITHUB_TOKEN=' "${envfile}" || echo "GITHUB_TOKEN=${GITHUB_TOKEN}" >> "${envfile}"
+    done
 fi
 
 docker compose build
@@ -37,23 +43,6 @@ _run composer install
 
 _run artisan dusk:chrome-driver
 
-if ! grep -q '^APP_KEY=.' .env; then
-    echo "Generating app key"
-    _run artisan key:generate
-fi
-
-if [ ! -f .env.testing ]; then
-    echo "Copying default test env file"
-    cp .env.testing.example .env.testing
-fi
-
-if [ ! -f .env.dusk.local ]; then
-    echo "Copying default dusk env file"
-    cp .env.dusk.local.example .env.dusk.local
-    echo "Generating app key for dusk"
-    _run_dusk artisan key:generate
-fi
-
 if [ -d storage/oauth-public.key ]; then
     echo "oauth-public.key is a directory. Removing it"
     rmdir storage/oauth-public.key
diff --git a/docker/development/run.sh b/docker/development/run.sh
index 372b5991eb7..4fd8d6eadc5 100755
--- a/docker/development/run.sh
+++ b/docker/development/run.sh
@@ -20,7 +20,19 @@ _migrate() {
 }
 
 _octane() {
-  exec ./artisan octane:start --host=0.0.0.0 "$@"
+    echo_counter=0
+    manifest_path='./public/assets/manifest.json'
+    while [ ! -f "$manifest_path" ]; do
+        if [ "$echo_counter" -le 0 ]; then
+            echo_counter=5
+            echo "waiting to start octane: ${manifest_path##*/} not found" >&2
+        fi
+
+        : $(( echo_counter -= 1 ))
+        sleep 1
+    done
+
+    exec ./artisan octane:start --host=0.0.0.0 "$@"
 }
 
 _schedule() {
diff --git a/package.json b/package.json
index 2753aca3d93..12f11813a47 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "jquery-ujs": "^1.2.3",
     "jquery.scrollto": "^2.1.2",
     "lang.js": "^1.1.14",
-    "less": "^3.9.0",
+    "less": "^4.2.1",
     "less-loader": "^11.1.3",
     "lodash": "^4.17.19",
     "mdast-util-gfm-autolink-literal": "^1.0.3",
diff --git a/resources/css/bem-index.less b/resources/css/bem-index.less
index 303aff7a7d2..c54c04ab27b 100644
--- a/resources/css/bem-index.less
+++ b/resources/css/bem-index.less
@@ -157,6 +157,7 @@
 @import "bem/fileupload";
 @import "bem/fixed-bar";
 @import "bem/flag-country";
+@import "bem/flag-team";
 @import "bem/floating-toolbar";
 @import "bem/floating-toolbar-button";
 @import "bem/follow-mapper";
@@ -382,9 +383,13 @@
 @import "bem/supporter-promo";
 @import "bem/supporter-quote";
 @import "bem/supporter-status";
+@import "bem/team-action-button";
 @import "bem/team-info-entries";
 @import "bem/team-info-entry";
 @import "bem/team-members";
+@import "bem/team-members-manage";
+@import "bem/team-settings";
+@import "bem/team-settings-description-preview";
 @import "bem/team-summary";
 @import "bem/textual-button";
 @import "bem/title";
diff --git a/resources/css/bem/beatmap-basic-stats.less b/resources/css/bem/beatmap-basic-stats.less
index 1689384731c..70b2b0f26a9 100644
--- a/resources/css/bem/beatmap-basic-stats.less
+++ b/resources/css/bem/beatmap-basic-stats.less
@@ -3,8 +3,8 @@
 
 .beatmap-basic-stats {
   display: flex;
+  gap: 10px;
   justify-content: space-between;
-  margin: -5px -5px;
   font-weight: 600;
   font-size: @font-size--normal;
   color: @yellow-light;
@@ -12,7 +12,6 @@
   &__entry {
     display: flex;
     flex: none;
-    padding: 5px 5px;
     align-items: center;
   }
 
diff --git a/resources/css/bem/beatmap-discussions-header-top.less b/resources/css/bem/beatmap-discussions-header-top.less
index 7a81bfc7186..32c2a199f74 100644
--- a/resources/css/bem/beatmap-discussions-header-top.less
+++ b/resources/css/bem/beatmap-discussions-header-top.less
@@ -11,22 +11,27 @@
     --gutter: @gutter-beatmapset-desktop;
   }
 
-  &__beatmap-stats {
-    position: absolute;
-
-    right: 0;
-    top: 0;
-    width: 100%;
+  &__basic-stats {
+    grid-area: stats;
     padding: 10px 10px 0;
-    flex-direction: column;
-    display: flex;
+  }
 
-    @media @narrow-up {
-      flex-direction: row;
-      justify-content: space-between;
+  &__beatmap-stats {
+    position: relative;
+    display: grid;
+    grid-template-areas: "owners stats" "chart chart";
+    grid-template-columns: 1fr auto;
+    background-color: hsl(var(--hsl-b4));
+
+    @media @narrow {
+      grid-template-areas: "stats" "owners" "chart";
     }
   }
 
+  &__chart {
+    grid-area: chart;
+  }
+
   &__content {
     position: relative;
     padding: 70px var(--gutter) 0;
@@ -81,10 +86,11 @@
     }
   }
 
-  &__guest {
+  &__owners {
+    grid-area: owners;
     font-size: @font-size--title-small;
-    display: flex;
-    align-items: center;
+    padding: 10px 10px 0;
+    overflow-wrap: anywhere;
   }
 
   &__stats {
diff --git a/resources/css/bem/beatmap-list.less b/resources/css/bem/beatmap-list.less
index caf159dd809..42029021738 100644
--- a/resources/css/bem/beatmap-list.less
+++ b/resources/css/bem/beatmap-list.less
@@ -86,7 +86,7 @@
     padding: 10px 0;
     min-width: 100%;
     width: max-content;
-    max-width: ~"max(90vw, 100%)";
+    max-width: min(max(90vw, 100%), @container-sm);
 
     display: none;
     .@{top}--selecting & {
diff --git a/resources/css/bem/beatmap-score-top.less b/resources/css/bem/beatmap-score-top.less
index 955885bfa0f..b3a2c7c8a17 100644
--- a/resources/css/bem/beatmap-score-top.less
+++ b/resources/css/bem/beatmap-score-top.less
@@ -9,7 +9,7 @@
   flex-direction: column;
 
   &__achieved {
-    margin: 2px 0;
+    margin-bottom: 2px; // more balanced margin
     font-size: @font-size--small;
   }
 
@@ -18,6 +18,12 @@
     margin: 0px 10px;
   }
 
+  &__flags {
+    display: flex;
+    gap: 5px;
+    font-size: @flag-size-medium; // icon size
+  }
+
   &__link-container {
     .full-size();
   }
@@ -130,6 +136,8 @@
 
   &__user-box {
     flex: none;
+    display: grid;
+    gap: 4px;
 
     @media @desktop {
       margin-right: 10px;
@@ -139,7 +147,6 @@
   &__username {
     font-size: 18px;
     font-weight: 700;
-    margin-bottom: 2px;
     display: block;
     .link-inverted();
   }
diff --git a/resources/css/bem/beatmap-scoreboard-table.less b/resources/css/bem/beatmap-scoreboard-table.less
index 35711f1da30..75adb4e6dec 100644
--- a/resources/css/bem/beatmap-scoreboard-table.less
+++ b/resources/css/bem/beatmap-scoreboard-table.less
@@ -184,12 +184,9 @@
     }
 
     &--user-link {
-      .link-inverted();
-      .link-hover({
-        text-decoration: underline;
-      });
-
       position: absolute;
+      display: flex;
+      gap: 5px;
     }
 
     &--zero {
@@ -221,4 +218,11 @@
       opacity: 1;
     }
   }
+
+  &__user-link {
+    .link-inverted();
+    .link-hover({
+      text-decoration: underline;
+    });
+  }
 }
diff --git a/resources/css/bem/beatmapset-discussions-chart.less b/resources/css/bem/beatmapset-discussions-chart.less
index 2dd600316dd..720ef03c145 100644
--- a/resources/css/bem/beatmapset-discussions-chart.less
+++ b/resources/css/bem/beatmapset-discussions-chart.less
@@ -5,11 +5,9 @@
   @_top: beatmapset-discussions-chart;
 
   --icon-area-height: 30px;
-  width: 100%;
-  height: 150px;
+  height: 115px;
   position: relative;
   padding: 0 40px;
-  background-color: @osu-colour-b4;
 
   &::before {
     --border-size: 2px;
@@ -32,7 +30,7 @@
   &__item {
     .link-plain();
     position: absolute;
-    top: 0;
+    bottom: 0;
     height: 100%;
     width: 6px;
     transform: translateX(-3px);
@@ -49,8 +47,8 @@
       background-image: linear-gradient(
         to top,
         hsl(var(--hsl-c1)),
-        hsl(var(--hsl-c1)) 10%,
-        hsla(var(--hsl-c1), 0) 70%
+        hsl(var(--hsl-c1)) 14%,
+        hsla(var(--hsl-c1), 0) 98%
       );
       transform: scaleX(var(--line-scale));
     }
diff --git a/resources/css/bem/circular-progress.less b/resources/css/bem/circular-progress.less
index f09fa991b37..f2e8da849d9 100644
--- a/resources/css/bem/circular-progress.less
+++ b/resources/css/bem/circular-progress.less
@@ -81,8 +81,8 @@
   &__label {
     position: absolute;
     z-index: 1;
-    width: 1 / @label-size;
-    line-height: 1 / @label-size;
+    width: (1 / @label-size);
+    line-height: (1 / @label-size);
     font-size: @label-size;
     text-align: center;
     white-space: nowrap;
diff --git a/resources/css/bem/daily-challenge.less b/resources/css/bem/daily-challenge.less
index d0353dd25c1..c3d8031eab4 100644
--- a/resources/css/bem/daily-challenge.less
+++ b/resources/css/bem/daily-challenge.less
@@ -5,9 +5,31 @@
   background: hsl(var(--hsl-b4));
   border-radius: @border-radius-large;
   min-width: 0;
+  position: relative;
   display: flex;
   align-items: center;
-  padding: 3px;
+  padding: 1px;
+  border: 2px solid transparent;
+
+  &--played-today {
+    border-color: @osu-colour-lime-1;
+
+    &::before {
+      .fas();
+      .center-content();
+      background-color: @osu-colour-lime-1;
+      border-radius: 50%;
+      color: @osu-colour-b6;
+      content: @fa-var-check;
+      font-size: 8px; // icon size
+      height: 16px;
+      position: absolute;
+      right: 0;
+      top: 0;
+      transform: translate(50%, -50%);
+      width: $height;
+    }
+  }
 
   &__name {
     font-size: @font-size--normal;
@@ -20,7 +42,7 @@
   }
 
   &__value-box {
-    border-radius: @border-radius-large;
+    border-radius: @border-radius-small;
     background: hsl(var(--hsl-b6));
     padding: 5px 10px;
   }
diff --git a/resources/css/bem/flag-country.less b/resources/css/bem/flag-country.less
index 69af6474c40..012148985d6 100644
--- a/resources/css/bem/flag-country.less
+++ b/resources/css/bem/flag-country.less
@@ -32,7 +32,7 @@
   }
 
   &--medium {
-    --height: 20px;
+    --height: @flag-size-medium;
   }
 
   &--small {
diff --git a/resources/css/bem/flag-team.less b/resources/css/bem/flag-team.less
new file mode 100644
index 00000000000..74df9529ad8
--- /dev/null
+++ b/resources/css/bem/flag-team.less
@@ -0,0 +1,20 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.flag-team {
+  height: 1em;
+  width: 2em;
+  display: inline-block;
+  background-color: #333;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  border-radius: min(0.25em, @border-radius-large);
+
+  &--full {
+    width: 100%;
+    height: 100%;
+    box-shadow: none;
+    border-radius: 0;
+  }
+}
diff --git a/resources/css/bem/forum-post-info.less b/resources/css/bem/forum-post-info.less
index 22dee15e953..ccf92068357 100644
--- a/resources/css/bem/forum-post-info.less
+++ b/resources/css/bem/forum-post-info.less
@@ -37,6 +37,7 @@
       width: 100%;
       display: flex;
       justify-content: center;
+      font-size: @flag-size-medium;
     }
 
     &--group-badge {
diff --git a/resources/css/bem/input-text.less b/resources/css/bem/input-text.less
index 26555c9fd3d..c809fe8db09 100644
--- a/resources/css/bem/input-text.less
+++ b/resources/css/bem/input-text.less
@@ -10,4 +10,16 @@
   padding: var(--input-padding);
   box-shadow: inset 0 0 0 2px var(--input-border-colour);
   border-radius: @border-radius-large;
+
+  &--bbcode {
+    .fancy-scrollbar();
+    display: grid;
+    grid-template-rows: 1fr auto;
+    gap: 5px;
+  }
+
+  &__bbcode-textarea {
+    .reset-input();
+    resize: none;
+  }
 }
diff --git a/resources/css/bem/loading-overlay.less b/resources/css/bem/loading-overlay.less
index 1e1f6593a9b..b90f10169b9 100644
--- a/resources/css/bem/loading-overlay.less
+++ b/resources/css/bem/loading-overlay.less
@@ -3,7 +3,7 @@
 
 @circle-size: 64px;
 @animation-length: 1.6s;
-@animation-delay: @animation-length / 4;
+@animation-delay: (@animation-length / 4);
 
 .loading-overlay {
   @_top: loading-overlay;
@@ -144,7 +144,7 @@
     animation-fill-mode: forwards;
     will-change: opacity;
 
-    @animation-delay-start: @animation-delay*1 / 8;
+    @animation-delay-start: (@animation-delay / 8);
 
     .@{_top}--visible & {
       animation-name: loading-overlay--follow-point;
diff --git a/resources/css/bem/page-contents.less b/resources/css/bem/page-contents.less
index 11461543112..e39ac49773b 100644
--- a/resources/css/bem/page-contents.less
+++ b/resources/css/bem/page-contents.less
@@ -30,8 +30,8 @@
     padding: 20px 20px 10px;
 
     @media @desktop {
-      flex-basis: 100% / 3;
-      max-width: 100% / 3;
+      flex-basis: (100% / 3);
+      max-width: (100% / 3);
 
       & + & {
         border-width: 0 0 0 1px;
diff --git a/resources/css/bem/profile-detail-bar.less b/resources/css/bem/profile-detail-bar.less
index 8524856f16d..49a0cd83b63 100644
--- a/resources/css/bem/profile-detail-bar.less
+++ b/resources/css/bem/profile-detail-bar.less
@@ -19,6 +19,10 @@
     --padding: @gutter-v2-desktop;
   }
 
+  &--team {
+    justify-content: end;
+  }
+
   &__level {
     margin-left: auto;
     display: flex;
diff --git a/resources/css/bem/profile-hue-selector.less b/resources/css/bem/profile-hue-selector.less
index a3b40262bbe..e7040735ca9 100644
--- a/resources/css/bem/profile-hue-selector.less
+++ b/resources/css/bem/profile-hue-selector.less
@@ -22,7 +22,7 @@
 
     .ui-slider &.ui-slider-handle {
       .default-border-radius();
-      margin-left: @handle-width / -2;
+      margin-left: (@handle-width / -2);
       top: 0;
       width: @handle-width;
       height: 100%;
diff --git a/resources/css/bem/profile-info.less b/resources/css/bem/profile-info.less
index 7cd9658deeb..1e1af4a4c9a 100644
--- a/resources/css/bem/profile-info.less
+++ b/resources/css/bem/profile-info.less
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 .profile-info {
-  --avatar: none;
   --avatar-radius-extended-desktop: 40px;
   --avatar-radius-extended: 20px;
   --avatar-radius: 20px;
@@ -40,7 +39,6 @@
 
   &--team {
     --avatar-width: calc(var(--avatar-height) * 2);
-    --avatar: url("~@images/headers/generic.jpg");
     --bg: url("~@images/headers/generic.jpg");
     background-color: hsl(var(--hsl-b4));
   }
@@ -60,7 +58,6 @@
     overflow: hidden;
     align-self: flex-end;
     margin-bottom: var(--vertical-padding);
-    background-image: var(--avatar);
     .default-box-shadow();
   }
 
@@ -107,41 +104,34 @@
     .link-plain();
     .link-white();
     display: flex;
+    gap: 4px;
     align-items: center;
   }
 
-  &__flag-flag {
-    font-size: var(--icon-height); // icon size
-  }
-
   &__flag-text {
+    font-size: @font-size--title-small;
     display: none;
 
     @media @desktop {
       display: block;
-      padding-left: 4px;
-      font-size: @font-size--title-small;
     }
   }
 
   &__flags {
-    --icon-font-size: @font-size--small;
-    --icon-height-desktop: 20px;
-    --icon-height: 15px;
-
     display: flex;
-    gap: 5px;
+    gap: 10px;
     margin-top: 10px;
+    font-size: 15px; // icon size
 
     @media @desktop {
-      --icon-height: var(--icon-height-desktop);
+      font-size: @flag-size-medium; // icon size
       margin-top: 5px;
     }
   }
 
   &__icon {
-    font-size: var(--icon-font-size); // icon size
-    height: var(--icon-height);
+    font-size: 0.75em; // icon size
+    height: (1em * 1em / $font-size); // revert sizing from font-size
     color: @osu-colour-c1;
     display: flex;
     text-shadow: none;
@@ -157,19 +147,21 @@
   }
 
   &__icons {
-    align-items: baseline;
-    gap: 2px;
-    margin-left: 5px;
-
     &--flag-inline {
       display: contents;
+
       @media @desktop {
         display: none;
       }
     }
 
     &--name-inline {
+      align-items: baseline;
+      gap: 2px;
+      margin-left: 5px;
+      font-size: 15px; // icon size
       display: none;
+
       @media @desktop {
         display: flex;
       }
@@ -190,9 +182,6 @@
   }
 
   &__name {
-    --icon-height: 15px;
-    --icon-font-size: @font-size--small;
-
     padding: 0;
     margin: -5px 0 0;
     font-weight: normal;
diff --git a/resources/css/bem/profile-page-cover-editor-button.less b/resources/css/bem/profile-page-cover-editor-button.less
index ac68ae3d4b9..a28abb0a1b0 100644
--- a/resources/css/bem/profile-page-cover-editor-button.less
+++ b/resources/css/bem/profile-page-cover-editor-button.less
@@ -4,7 +4,8 @@
 .profile-page-cover-editor-button {
   position: absolute;
   bottom: 10px;
-  display: flex;
+  display: grid;
+  gap: 10px;
   justify-content: center;
   right: @gutter-v2;
 
diff --git a/resources/css/bem/ranking-page-table.less b/resources/css/bem/ranking-page-table.less
index e27cb807bba..5129952b76e 100644
--- a/resources/css/bem/ranking-page-table.less
+++ b/resources/css/bem/ranking-page-table.less
@@ -105,6 +105,12 @@
     margin-left: 10px;
   }
 
+  &__flags {
+    display: inline-flex;
+    gap: 10px;
+    font-size: @flag-size-medium; // icon size
+  }
+
   &__user-link {
     display: flex;
     align-items: center;
diff --git a/resources/css/bem/store-slider.less b/resources/css/bem/store-slider.less
index 6427c16a2c8..98035ced62b 100644
--- a/resources/css/bem/store-slider.less
+++ b/resources/css/bem/store-slider.less
@@ -29,7 +29,7 @@
 
   &__fake-callout {
     position: absolute;
-    left: @slider-handle-width / 2;
+    left: (@slider-handle-width / 2);
     padding-bottom: @slider-callout--arrow-height;
     transform: translateX(-50%);
     bottom: calc(100% + @slider-callout--arrow-gap);
diff --git a/resources/css/bem/supporter-icon.less b/resources/css/bem/supporter-icon.less
index d4e3c4bb275..1528fcee55e 100644
--- a/resources/css/bem/supporter-icon.less
+++ b/resources/css/bem/supporter-icon.less
@@ -26,7 +26,7 @@
   &--user-card {
     height: @user-card-icon-size;
     width: @user-card-icon-size;
-    font-size: @user-card-icon-size / 2;
+    font-size: (@user-card-icon-size / 2);
     border-radius: 50%;
     padding: 1px 0 0;
   }
diff --git a/resources/css/bem/team-action-button.less b/resources/css/bem/team-action-button.less
new file mode 100644
index 00000000000..bb0712b5cc3
--- /dev/null
+++ b/resources/css/bem/team-action-button.less
@@ -0,0 +1,31 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.team-action-button {
+  .reset-input();
+  .link-plain();
+  .link-white();
+  .center-content();
+  .default-text-shadow();
+  display: flex;
+  width: auto;
+  height: 100%;
+  padding: 10px 30px;
+  border-radius: 10000px;
+  text-align: center;
+  font-weight: bold;
+  font-size: @font-size--title-small;
+  background: var(--bg);
+
+  --bg: hsl(var(--hsl-b5));
+  --bg-hover: hsl(var(--hsl-b6));
+
+  &:hover {
+    background: var(--bg-hover);
+  }
+
+  &--part {
+    --bg: hsl(var(--hsl-red-3));
+    --bg-hover: hsl(var(--hsl-red-2));
+  }
+}
diff --git a/resources/css/bem/team-members-manage.less b/resources/css/bem/team-members-manage.less
new file mode 100644
index 00000000000..250e0ddc726
--- /dev/null
+++ b/resources/css/bem/team-members-manage.less
@@ -0,0 +1,48 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.team-members-manage {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  font-size: @font-size--title-small;
+  display: grid;
+  gap: 2px 10px;
+  grid-template-columns: 1fr auto auto auto;
+
+  &__avatar {
+    .default-border-radius();
+    overflow: hidden;
+    width: @user-list-icon-size;
+    height: $width;
+  }
+
+  &__item {
+    --bg: hsl(var(--hsl-b3));
+    --bg-hover: hsl(var(--hsl-b2));
+    .default-border-radius();
+    display: grid;
+    grid-template-columns: subgrid;
+    grid-column: 1 / -1;
+    align-items: center;
+    padding: 3px 10px;
+    background: var(--bg);
+
+    &:hover {
+      background: var(--bg-hover);
+    }
+
+    &--header {
+      --bg: none;
+      --bg-hover: var(--bg);
+      font-weight: 600;
+    }
+  }
+
+  &__username {
+    display: flex;
+    align-items: center;
+    width: max-content;
+    gap: 10px;
+  }
+}
diff --git a/resources/css/bem/team-settings-description-preview.less b/resources/css/bem/team-settings-description-preview.less
new file mode 100644
index 00000000000..2e78b7b8d33
--- /dev/null
+++ b/resources/css/bem/team-settings-description-preview.less
@@ -0,0 +1,8 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.team-settings-description-preview {
+  padding: 0 var(--padding);
+  overflow-y: scroll;
+  height: calc(70 * var(--vh));
+}
diff --git a/resources/css/bem/team-settings.less b/resources/css/bem/team-settings.less
new file mode 100644
index 00000000000..d8df6d1fcee
--- /dev/null
+++ b/resources/css/bem/team-settings.less
@@ -0,0 +1,44 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+.team-settings {
+  display: grid;
+  gap: 5px;
+
+  &__description-preview {
+    --padding: 10px;
+    padding: var(--padding) 0;
+    background-color: hsl(var(--hsl-b3));
+    border-radius: @border-radius-large;
+  }
+
+  &__help {
+    color: hsl(var(--hsl-c2));
+    font-size: @font-size--normal;
+  }
+
+  &__image {
+    min-width: 0;
+    max-width: 100%;
+    border-radius: @border-radius-large;
+    object-fit: contain;
+  }
+
+  &__item {
+    display: grid;
+    grid-template-columns: 2fr 1fr;
+    gap: 15px;
+
+    &--buttons {
+      grid-template-columns: 1fr auto;
+    }
+
+    &--description {
+      grid-template-columns: 1fr 1fr;
+    }
+
+    &--image {
+      grid-template-columns: 1fr;
+    }
+  }
+}
diff --git a/resources/css/bem/user-action-button.less b/resources/css/bem/user-action-button.less
index f38ad6b9e07..1b978e6f730 100644
--- a/resources/css/bem/user-action-button.less
+++ b/resources/css/bem/user-action-button.less
@@ -71,7 +71,7 @@
   &--user-card {
     height: @user-card-icon-size;
     width: @user-card-icon-size;
-    font-size: @user-card-icon-size / 2;
+    font-size: (@user-card-icon-size / 2);
     border-radius: 50%;
   }
 
diff --git a/resources/css/jquery-ui/slider.less b/resources/css/jquery-ui/slider.less
index 811dc4ded91..d7086e213e6 100644
--- a/resources/css/jquery-ui/slider.less
+++ b/resources/css/jquery-ui/slider.less
@@ -37,8 +37,8 @@
   height: @slider-height;
 
   .ui-slider-handle {
-    top: -(@slider-handle-height - @slider-height) / 2;
-    margin-left: -@slider-handle-width / 2;
+    top: (-(@slider-handle-height - @slider-height) / 2);
+    margin-left: (-@slider-handle-width / 2);
   }
 
   .ui-slider-range {
diff --git a/resources/css/variables.less b/resources/css/variables.less
index 2487a6c61a3..95f6dff411f 100644
--- a/resources/css/variables.less
+++ b/resources/css/variables.less
@@ -324,3 +324,5 @@
 @user-card-height: 120px;
 
 @user-list-icon-size: 20px;
+
+@flag-size-medium: 20px;
diff --git a/resources/js/beatmap-discussions/beatmap-owner-editor.tsx b/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
index d071c24c6c3..f6d616000f1 100644
--- a/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
+++ b/resources/js/beatmap-discussions/beatmap-owner-editor.tsx
@@ -189,6 +189,7 @@ export default class BeatmapOwnerEditor extends React.Component<Props> {
         <div className={classWithModifiers('beatmap-owner-editor-owners', { editing: this.editing })}>
           {this.editing ? (
             <UsernameInput
+              excludeBots
               initialUsers={this.owners}
               // initialValue not set for owner editor as value is reset when cancelled.
               modifiers='beatmap-owner-editor'
diff --git a/resources/js/beatmap-discussions/header.tsx b/resources/js/beatmap-discussions/header.tsx
index fd74968c73c..7bb4de86829 100644
--- a/resources/js/beatmap-discussions/header.tsx
+++ b/resources/js/beatmap-discussions/header.tsx
@@ -174,26 +174,26 @@ export class Header extends React.Component<Props> {
               </div>
             </div>
           </div>
-          <div className='u-relative'>
-            <Chart
-              discussions={this.timelineDiscussions}
-              duration={this.currentBeatmap.total_length * 1000}
-            />
-            <div className={`${bn}__beatmap-stats`}>
-              <div className={`${bn}__guest`}>
-                {hasGuestOwners(this.currentBeatmap, this.beatmapset) && (
-                  <span>
-                    <StringWithComponent
-                      mappings={{
-                        user: <UserLinkList users={this.currentBeatmap.owners ?? []} />,
-                      }}
-                      pattern={trans('beatmaps.discussions.guest')}
-                    />
-                  </span>
-                )}
-              </div>
+          <div className={`${bn}__beatmap-stats`}>
+            <div className={`${bn}__owners`}>
+              {hasGuestOwners(this.currentBeatmap, this.beatmapset) && (
+                <StringWithComponent
+                  mappings={{
+                    user: <UserLinkList users={this.currentBeatmap.owners ?? []} />,
+                  }}
+                  pattern={trans('beatmaps.discussions.guest')}
+                />
+              )}
+            </div>
+            <div className={`${bn}__basic-stats`}>
               <BeatmapBasicStats beatmap={this.currentBeatmap} beatmapset={this.beatmapset} />
             </div>
+            <div className={`${bn}__chart`}>
+              <Chart
+                discussions={this.timelineDiscussions}
+                duration={this.currentBeatmap.total_length * 1000}
+              />
+            </div>
           </div>
         </div>
       </div>
diff --git a/resources/js/beatmap-discussions/user-card.tsx b/resources/js/beatmap-discussions/user-card.tsx
index 53ab7e3e283..71a34658c74 100644
--- a/resources/js/beatmap-discussions/user-card.tsx
+++ b/resources/js/beatmap-discussions/user-card.tsx
@@ -3,6 +3,7 @@
 
 import UserAvatar from 'components/user-avatar';
 import UserGroupBadge from 'components/user-group-badge';
+import UserLink from 'components/user-link';
 import UserGroupJson from 'interfaces/user-group-json';
 import UserJson from 'interfaces/user-json';
 import { route } from 'laroute';
@@ -32,12 +33,12 @@ export class UserCard extends React.PureComponent<Props> {
               <UserAvatar modifiers='full-rounded' user={this.props.user} />
             </span>
           ) : (
-            <a
+            <UserLink
               className={`${bn}__user-link`}
-              href={route('users.show', { user: this.props.user.id })}
+              user={this.props.user}
             >
               <UserAvatar modifiers='full-rounded' user={this.props.user} />
-            </a>
+            </UserLink>
           )}
         </div>
 
@@ -49,12 +50,12 @@ export class UserCard extends React.PureComponent<Props> {
               </span>
 
             ) : (
-              <a
+              <UserLink
                 className={`${bn}__user-link`}
-                href={route('users.show', { user: this.props.user.id })}
+                user={this.props.user}
               >
                 {this.renderUsername()}
-              </a>
+              </UserLink>
             )}
             {!this.props.user.is_bot && !this.props.user.is_deleted && (
               <a
diff --git a/resources/js/beatmapsets-show/controller.ts b/resources/js/beatmapsets-show/controller.ts
index 7447723e6cf..8216dd4c523 100644
--- a/resources/js/beatmapsets-show/controller.ts
+++ b/resources/js/beatmapsets-show/controller.ts
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import { BeatmapsetJsonForShow } from 'interfaces/beatmapset-extended-json';
+import TagJson from 'interfaces/tag-json';
 import UserJson from 'interfaces/user-json';
 import { keyBy } from 'lodash';
 import { action, computed, makeObservable, observable, runInAction } from 'mobx';
@@ -10,6 +11,7 @@ import core from 'osu-core-singleton';
 import { find, findDefault, group } from 'utils/beatmap-helper';
 import { parse } from 'utils/beatmapset-page-hash';
 import { parseJson } from 'utils/json';
+import { present } from 'utils/string';
 import { currentUrl } from 'utils/turbolinks';
 
 export type ScoreLoadingState = null | 'error' | 'loading' | 'supporter_only' | 'unranked';
@@ -23,6 +25,8 @@ interface State {
   showingNsfwWarning: boolean;
 }
 
+type TagJsonWithCount = TagJson & { count: number };
+
 export default class Controller {
   @observable hoveredBeatmap: null | BeatmapJsonForBeatmapsetShow = null;
   @observable state: State;
@@ -70,6 +74,39 @@ export default class Controller {
     return this.beatmaps.get(this.currentBeatmap.mode) ?? [];
   }
 
+  @computed
+  get relatedTags() {
+    const map = new Map<number, TagJson>();
+
+    for (const tag of this.beatmapset.related_tags) {
+      map.set(tag.id, tag);
+    }
+
+    return map;
+  }
+
+  @computed
+  get tags() {
+    const userTags: TagJsonWithCount[] = [];
+
+    if (this.currentBeatmap.top_tag_ids != null) {
+      for (const tagId of this.currentBeatmap.top_tag_ids) {
+        const maybeTag = this.relatedTags.get(tagId.tag_id);
+        if (maybeTag == null) continue;
+
+        userTags.push({ ...maybeTag, count: tagId.count } );
+      }
+    }
+
+    return {
+      mapperTags: this.beatmapset.tags.split(' ').filter(present),
+      userTags: userTags.sort((a, b) => {
+        const diff = b.count - a.count;
+        return diff !== 0 ? diff : a.name.localeCompare(b.name);
+      }),
+    };
+  }
+
   @computed
   get usersById() {
     return keyBy(this.beatmapset.related_users, 'id') as Partial<Record<number, UserJson>>;
diff --git a/resources/js/beatmapsets-show/info.tsx b/resources/js/beatmapsets-show/info.tsx
index a6c3ca251f0..5165f659092 100644
--- a/resources/js/beatmapsets-show/info.tsx
+++ b/resources/js/beatmapsets-show/info.tsx
@@ -65,6 +65,15 @@ export default class Info extends React.Component<Props> {
     return ret;
   }
 
+  private get tags() {
+    const tags = this.controller.tags;
+
+    return [
+      ...tags.userTags.map((tag) => tag.name),
+      ...tags.mapperTags,
+    ];
+  }
+
   private get withEditDescription() {
     return this.controller.beatmapset.description.bbcode != null;
   }
@@ -84,10 +93,6 @@ export default class Info extends React.Component<Props> {
   }
 
   render() {
-    const tags = this.controller.beatmapset.tags
-      .split(' ')
-      .filter(present);
-
     return (
       <div className='beatmapset-info u-fancy-scrollbar'>
         {this.isEditingDescription &&
@@ -191,13 +196,13 @@ export default class Info extends React.Component<Props> {
             </div>
           </div>
 
-          {tags.length > 0 &&
+          {this.tags.length > 0 &&
             <div className='beatmapset-info__row beatmapset-info__row--value-overflow'>
               <h3 className='beatmapset-info__header'>
                 {trans('beatmapsets.show.info.tags')}
               </h3>
               <div className='beatmapset-info__value-overflow'>
-                {tags.map((tag, i) => (
+                {this.tags.map((tag, i) => (
                   <React.Fragment key={`${tag}-${i}`}>
                     <a
                       className='beatmapset-info__link'
diff --git a/resources/js/beatmapsets-show/scoreboard/table-row.tsx b/resources/js/beatmapsets-show/scoreboard/table-row.tsx
index a26908235e0..72ada1397b6 100644
--- a/resources/js/beatmapsets-show/scoreboard/table-row.tsx
+++ b/resources/js/beatmapsets-show/scoreboard/table-row.tsx
@@ -2,10 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import FlagCountry from 'components/flag-country';
+import FlagTeam from 'components/flag-team';
 import Mod from 'components/mod';
 import { PlayDetailMenu } from 'components/play-detail-menu';
 import ScoreValue from 'components/score-value';
 import ScoreboardTime from 'components/scoreboard-time';
+import UserLink from 'components/user-link';
 import BeatmapJson from 'interfaces/beatmap-json';
 import { SoloScoreJsonForBeatmap } from 'interfaces/solo-score-json';
 import { route } from 'laroute';
@@ -113,14 +115,18 @@ export default class ScoreboardTableRow extends React.Component<Props> {
           </TdLink>
         ) : (
           <td className={`${bn}__cell u-relative`}>
-            <a
-              className={`${bn}__cell-content ${bn}__cell-content--user-link js-usercard`}
-              data-user-id={score.user.id}
-              href={route('users.show', { mode: this.props.beatmap.mode, user: score.user.id })}
-            >
-              {score.user.username}
-            </a>
-
+            <span className={`${classWithModifiers(`${bn}__cell-content`, 'user-link')}`}>
+              {score.user.team != null &&
+                <a className='u-contents' href={route('teams.show', { id: score.user.team.id })}>
+                  <FlagTeam team={score.user.team} />
+                </a>
+              }
+              <UserLink
+                className={`${bn}__user-link`}
+                mode={this.props.beatmap.mode}
+                user={score.user}
+              />
+            </span>
             <a className={`${bn}__cell-content`} href={this.scoreUrl} />
           </td>
         )}
diff --git a/resources/js/beatmapsets-show/scoreboard/top-card.tsx b/resources/js/beatmapsets-show/scoreboard/top-card.tsx
index 68a87e5cadb..6250d4d57e4 100644
--- a/resources/js/beatmapsets-show/scoreboard/top-card.tsx
+++ b/resources/js/beatmapsets-show/scoreboard/top-card.tsx
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import FlagCountry from 'components/flag-country';
+import FlagTeam from 'components/flag-team';
 import Mod from 'components/mod';
 import ScorePin from 'components/score-pin';
 import ScoreValue from 'components/score-value';
@@ -80,19 +81,30 @@ export default class TopCard extends React.PureComponent<Props> {
                 />
               </div>
 
-              <a
-                className='u-hover'
-                href={route('rankings', {
-                  country: this.props.score.user.country_code,
-                  mode: ruleset,
-                  type: 'performance',
-                })}
-              >
-                <FlagCountry
-                  country={this.props.score.user.country}
-                  modifiers='flat'
-                />
-              </a>
+              <div className='beatmap-score-top__flags'>
+                <a
+                  className='u-hover'
+                  href={route('rankings', {
+                    country: this.props.score.user.country_code,
+                    mode: ruleset,
+                    type: 'performance',
+                  })}
+                >
+                  <FlagCountry
+                    country={this.props.score.user.country}
+                    modifiers='flat'
+                  />
+                </a>
+
+                {this.props.score.user.team != null &&
+                  <a
+                    className='u-hover'
+                    href={route('teams.show', { team: this.props.score.user.team.id })}
+                  >
+                    <FlagTeam team={this.props.score.user.team} />
+                  </a>
+                }
+              </div>
             </div>
           </div>
 
diff --git a/resources/js/chat/create-announcement.tsx b/resources/js/chat/create-announcement.tsx
index 2d15326b015..0b1b3ffe2ae 100644
--- a/resources/js/chat/create-announcement.tsx
+++ b/resources/js/chat/create-announcement.tsx
@@ -81,6 +81,7 @@ export default class CreateAnnouncement extends React.Component<Props> {
               <div className='chat-form-users'>
                 <UserCardBrick user={core.currentUserOrFail} />
                 <UsernameInput
+                  excludeBots
                   id='chat-form-users'
                   ignoreCurrentUser
                   name='users'
diff --git a/resources/js/components/flag-team.tsx b/resources/js/components/flag-team.tsx
new file mode 100644
index 00000000000..e4601680c22
--- /dev/null
+++ b/resources/js/components/flag-team.tsx
@@ -0,0 +1,16 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import TeamJson from 'interfaces/team-json';
+import * as React from 'react';
+import { urlPresence } from 'utils/css';
+
+export default function FlagTeam({ team }: { team: TeamJson }) {
+  return (
+    <span
+      className='flag-team'
+      style={{ backgroundImage: urlPresence(team.logo) }}
+      title={team.name}
+    />
+  );
+}
diff --git a/resources/js/components/user-card.tsx b/resources/js/components/user-card.tsx
index 8c5ca1ac5a4..403ef104f45 100644
--- a/resources/js/components/user-card.tsx
+++ b/resources/js/components/user-card.tsx
@@ -14,6 +14,7 @@ import { trans } from 'utils/lang';
 import { present } from 'utils/string';
 import { giftSupporterTagUrl } from 'utils/url';
 import FlagCountry from './flag-country';
+import FlagTeam from './flag-team';
 import FollowUserMappingButton from './follow-user-mapping-button';
 import { PopupMenuPersistent } from './popup-menu-persistent';
 import { ReportReportable } from './report-reportable';
@@ -226,6 +227,15 @@ export class UserCard extends React.PureComponent<Props, State> {
           <FlagCountry country={this.user.country} />
         </a>
 
+        {this.user.team != null && (
+          <a
+            className='user-card__icon user-card__icon--flag'
+            href={route('teams.show', { team: this.user.team.id })}
+          >
+            <FlagTeam team={this.user.team} />
+          </a>
+        )}
+
         {this.props.mode === 'card' && (
           <>
             {this.user.is_supporter && (
diff --git a/resources/js/components/username-input.tsx b/resources/js/components/username-input.tsx
index 0a8dda7dc3c..d347f756895 100644
--- a/resources/js/components/username-input.tsx
+++ b/resources/js/components/username-input.tsx
@@ -15,6 +15,7 @@ import { Spinner } from './spinner';
 import UserCardBrick from './user-card-brick';
 
 interface Props {
+  excludeBots?: boolean;
   id?: string;
   ignoreCurrentUser?: boolean;
   initialUsers?: UserJson[];
@@ -166,7 +167,7 @@ export default class UsernameInput extends React.PureComponent<Props> {
     }
 
     try {
-      this.xhr = apiLookupUsers(userIds);
+      this.xhr = apiLookupUsers(userIds, this.props.excludeBots);
       const response = await this.xhr;
       this.extractValidUsers(response.users);
     } catch (error) {
diff --git a/resources/js/core-legacy/changelog-chart-loader.coffee b/resources/js/core-legacy/changelog-chart-loader.coffee
index 2e6a570da3f..25c056497aa 100644
--- a/resources/js/core-legacy/changelog-chart-loader.coffee
+++ b/resources/js/core-legacy/changelog-chart-loader.coffee
@@ -4,17 +4,28 @@
 import ChangelogChart from 'charts/changelog-chart'
 
 export default class ChangelogChartLoader
-  container: document.getElementsByClassName('js-changelog-chart')
-
   constructor: ->
-    $(window).on 'resize', @resize
-    $(document).on 'turbo:load', @initialize
+    document.addEventListener 'turbo:load', @initialize
+    document.addEventListener 'turbo:before-cache', @reset
+
 
   initialize: =>
-    return if !@container[0]?
+    container = document.querySelector('.js-changelog-chart')
+
+    return unless container?
+
+    # reset existing chart
+    container.innerHTML = ''
+
+    @chart = new ChangelogChart container
+    @chart.loadData()
+    window.addEventListener 'resize', @resize
+
+
+  reset: =>
+    @chart = null
+    window.removeEventListener 'resize', @resize
 
-    @container[0]._chart = new ChangelogChart @container[0]
-    @container[0]._chart.loadData()
 
   resize: =>
-    @container[0]?._chart.resize()
+    @chart.resize()
diff --git a/resources/js/core-legacy/post-preview.coffee b/resources/js/core-legacy/post-preview.coffee
deleted file mode 100644
index a9fef6e94db..00000000000
--- a/resources/js/core-legacy/post-preview.coffee
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
-# See the LICENCE file in the repository root for full licence text.
-
-import { route } from 'laroute'
-
-export default class PostPreview
-  constructor: ->
-    @debouncedLoadPreview = _.debounce @loadPreview, 500
-
-    $(document).on 'input', '.js-post-preview--auto', (e) =>
-      # get the target immediately because event object may change later.
-      @debouncedLoadPreview(e.currentTarget)
-
-
-  loadPreview: (target) =>
-    $form = $(target).closest('form')
-    body = target.value
-    $preview = $form.find('.js-post-preview--preview')
-    preview = $preview[0]
-    $previewBox = $form.find('.js-post-preview--box')
-
-    if !preview?
-      return
-
-    preview._xhr?.abort()
-
-    if body == ''
-      $previewBox.addClass 'hidden'
-      return
-
-    if $preview.attr('data-raw') == body
-      $previewBox.removeClass 'hidden'
-      return
-
-    preview._xhr = $.post(route('bbcode-preview'), text: body)
-    .done (data) =>
-      $preview.html data
-      $preview.attr 'data-raw', body
-      $previewBox.removeClass 'hidden'
diff --git a/resources/js/core/bbcode-auto-preview.ts b/resources/js/core/bbcode-auto-preview.ts
new file mode 100644
index 00000000000..cf76f73b35a
--- /dev/null
+++ b/resources/js/core/bbcode-auto-preview.ts
@@ -0,0 +1,59 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+import { route } from 'laroute';
+import { debounce } from 'lodash';
+import { fail } from 'utils/fail';
+import { htmlElementOrNull } from 'utils/html';
+
+export default class BbcodeAutoPreview {
+  private readonly debouncedLoadPreview;
+  private readonly xhr = new Map<HTMLElement, JQuery.jqXHR<string>>();
+
+  constructor() {
+    this.debouncedLoadPreview = debounce(this.loadPreview, 500);
+    document.addEventListener('input', this.onInput);
+  }
+
+  private readonly loadPreview = (target: HTMLTextAreaElement) => {
+    const form = target.closest('form') ?? fail('form element is missing');
+    const body = target.value;
+    const preview = htmlElementOrNull(form.querySelector('.js-post-preview--preview'));
+    const previewBox = form.querySelector('.js-post-preview--box');
+
+    if (preview == null) {
+      return;
+    }
+
+    this.xhr.get(preview)?.abort();
+
+    if (body === '') {
+      preview.dataset.raw = '';
+      preview.innerHTML = '';
+      previewBox?.classList.add('hidden');
+      return;
+    }
+
+    if (preview.dataset.raw === body) {
+      previewBox?.classList.remove('hidden');
+      return;
+    }
+
+    const xhr = $.post(route('bbcode-preview'), { text: body }) as JQuery.jqXHR<string>;
+    xhr.done((data) => {
+      preview.dataset.raw = body;
+      preview.innerHTML = data;
+      previewBox?.classList.remove('hidden');
+    }).always(() => {
+      this.xhr.delete(preview);
+    });
+  };
+
+  private readonly onInput = (e: InputEvent) => {
+    const target = htmlElementOrNull(e.target)?.closest('.js-post-preview--auto');
+
+    if (target instanceof HTMLTextAreaElement) {
+      this.debouncedLoadPreview(target);
+    }
+  };
+}
diff --git a/resources/js/forum/post-box.coffee b/resources/js/forum/post-box.coffee
index 1e22449b25d..f99d5afffaf 100644
--- a/resources/js/forum/post-box.coffee
+++ b/resources/js/forum/post-box.coffee
@@ -25,10 +25,8 @@ insert = (event, tagOpen, tagClose = '') ->
     box.selectionStart = startPos
     box.selectionEnd = texts[0].length + texts[1].length + tagClose.length
 
-  $box
-    .trigger 'bbcode:inserted' # for react
-    .trigger 'input' # ignored by react
-    .focus()
+  box.dispatchEvent(new InputEvent('input', bubbles: true))
+  box.focus()
 
 [
   ['bold', '[b]', '[/b]']
diff --git a/resources/js/globals.d.ts b/resources/js/globals.d.ts
index 5af77fe4d0d..8dd779546cc 100644
--- a/resources/js/globals.d.ts
+++ b/resources/js/globals.d.ts
@@ -35,16 +35,8 @@ interface Window {
 }
 // #endregion
 
-// #region interfaces for using process.env
-interface Process {
-  env: ProcessEnv;
-}
-
-interface ProcessEnv {
-  [key: string]: string | undefined;
-}
-
-declare const process: Process;
+// #region defined through webpack DefinePlugin
+declare const docsUrl: string;
 // #endregion
 
 // our helpers
diff --git a/resources/js/interfaces/beatmap-json.ts b/resources/js/interfaces/beatmap-json.ts
index a7d40211981..f00b9b24a14 100644
--- a/resources/js/interfaces/beatmap-json.ts
+++ b/resources/js/interfaces/beatmap-json.ts
@@ -17,6 +17,7 @@ interface BeatmapJsonAvailableIncludes {
   failtimes: BeatmapFailTimesArray;
   max_combo: number;
   owners: BeatmapOwnerJson[];
+  top_tag_ids: { count: number; tag_id: number }[];
   user: UserJson;
 }
 
diff --git a/resources/js/interfaces/beatmapset-extended-json.ts b/resources/js/interfaces/beatmapset-extended-json.ts
index 1a41e2c9d3c..c7ff2f4038d 100644
--- a/resources/js/interfaces/beatmapset-extended-json.ts
+++ b/resources/js/interfaces/beatmapset-extended-json.ts
@@ -55,6 +55,7 @@ type BeatmapsetJsonForShowIncludes = Required<Pick<BeatmapsetExtendedJson,
 | 'language'
 | 'ratings'
 | 'recent_favourites'
+| 'related_tags'
 | 'related_users'
 | 'user'
 >>;
diff --git a/resources/js/interfaces/beatmapset-json.ts b/resources/js/interfaces/beatmapset-json.ts
index 533ee955779..f6203c3c052 100644
--- a/resources/js/interfaces/beatmapset-json.ts
+++ b/resources/js/interfaces/beatmapset-json.ts
@@ -9,6 +9,7 @@ import BeatmapsetNominationJson from './beatmapset-nomination-json';
 import GenreJson from './genre-json';
 import LanguageJson from './language-json';
 import Ruleset from './ruleset';
+import TagJson from './tag-json';
 import UserJson, { UserJsonDeleted } from './user-json';
 
 export interface Availability {
@@ -92,6 +93,7 @@ interface BeatmapsetJsonAvailableIncludes {
   nominations: BeatmapsetNominationsInterface;
   ratings: number[];
   recent_favourites: UserJson[];
+  related_tags: TagJson[];
   related_users: UserJson[];
   user: UserJson | UserJsonDeleted;
 }
diff --git a/resources/js/interfaces/tag-json.ts b/resources/js/interfaces/tag-json.ts
new file mode 100644
index 00000000000..5d1352a7a4b
--- /dev/null
+++ b/resources/js/interfaces/tag-json.ts
@@ -0,0 +1,8 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+export default interface TagJson {
+  description: string;
+  id: number;
+  name: string;
+}
diff --git a/resources/js/interfaces/team-json.ts b/resources/js/interfaces/team-json.ts
new file mode 100644
index 00000000000..16270293c1b
--- /dev/null
+++ b/resources/js/interfaces/team-json.ts
@@ -0,0 +1,9 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+export default interface TeamJson {
+  id: number;
+  logo: string | null;
+  name: string;
+  short_name: string;
+}
diff --git a/resources/js/interfaces/user-json.ts b/resources/js/interfaces/user-json.ts
index 137f8c2d817..75cc94c65c4 100644
--- a/resources/js/interfaces/user-json.ts
+++ b/resources/js/interfaces/user-json.ts
@@ -6,6 +6,7 @@ import DailyChallengeUserStatsJson from './daily-challenge-user-stats-json';
 import ProfileBannerJson from './profile-banner';
 import RankHighestJson from './rank-highest-json';
 import RankHistoryJson from './rank-history-json';
+import TeamJson from './team-json';
 import UserAccountHistoryJson from './user-account-history-json';
 import UserAchievementJson from './user-achievement-json';
 import UserBadgeJson from './user-badge-json';
@@ -66,6 +67,7 @@ interface UserJsonAvailableIncludes {
   statistics: UserStatisticsJson;
   statistics_rulesets: UserStatisticsRulesetsJson;
   support_level: number;
+  team: TeamJson;
   unread_pm_count: number;
   user_achievements: UserAchievementJson[];
   user_preferences: UserPreferencesJson;
diff --git a/resources/js/legacy-api-key/form.tsx b/resources/js/legacy-api-key/form.tsx
index f9c561d7694..9173cef1114 100644
--- a/resources/js/legacy-api-key/form.tsx
+++ b/resources/js/legacy-api-key/form.tsx
@@ -72,7 +72,7 @@ export default class Form extends React.Component<Props> {
           <div>
             <StringWithComponent
               mappings={{ link: (
-                <a href={`${process.env.DOCS_URL}#terms-of-use`}>
+                <a href={`${docsUrl}#terms-of-use`}>
                   {trans('oauth.new_client.terms_of_use.link')}
                 </a>
               ) }}
diff --git a/resources/js/main.coffee b/resources/js/main.coffee
index 964ae4ebd66..5e49fc5bb2d 100644
--- a/resources/js/main.coffee
+++ b/resources/js/main.coffee
@@ -24,7 +24,6 @@ import LandingGraph from 'core-legacy/landing-graph'
 import Menu from 'core-legacy/menu'
 import NavButton from 'core-legacy/nav-button'
 import Nav2 from 'core-legacy/nav2'
-import PostPreview from 'core-legacy/post-preview'
 import Search from 'core-legacy/search'
 import { StoreCheckout } from 'core-legacy/store-checkout'
 import TooltipDefault from 'core-legacy/tooltip-default'
@@ -60,7 +59,6 @@ window.globalDrag ?= new GlobalDrag
 window.landingGraph ?= new LandingGraph
 window.menu ?= new Menu
 window.navButton ?= new NavButton
-window.postPreview ?= new PostPreview
 window.search ?= new Search
 window.tooltipDefault ?= new TooltipDefault
 
diff --git a/resources/js/oauth/new-client.tsx b/resources/js/oauth/new-client.tsx
index a06df20f383..628098e9f96 100644
--- a/resources/js/oauth/new-client.tsx
+++ b/resources/js/oauth/new-client.tsx
@@ -82,7 +82,7 @@ export class NewClient extends React.Component {
           <div>
             <StringWithComponent
               mappings={{ link: (
-                <a href={`${process.env.DOCS_URL}#terms-of-use`}>
+                <a href={`${docsUrl}#terms-of-use`}>
                   {trans('oauth.new_client.terms_of_use.link')}
                 </a>
               ) }}
diff --git a/resources/js/osu-core.ts b/resources/js/osu-core.ts
index 3f1329e9fd9..fab7aafc277 100644
--- a/resources/js/osu-core.ts
+++ b/resources/js/osu-core.ts
@@ -7,6 +7,7 @@ import AccountEdit from 'core/account-edit';
 import AccountEditAvatar from 'core/account-edit-avatar';
 import AccountEditBlocklist from 'core/account-edit-blocklist';
 import AnimateNav from 'core/animate-nav';
+import BbcodeAutoPreview from 'core/bbcode-auto-preview';
 import BrowserTitleWithNotificationCount from 'core/browser-title-with-notification-count';
 import Captcha from 'core/captcha';
 import ClickMenu from 'core/click-menu';
@@ -49,6 +50,7 @@ export default class OsuCore {
   readonly accountEditAvatar;
   readonly accountEditBlocklist;
   readonly animateNav;
+  readonly bbcodeAutoPreview;
   readonly beatmapsetSearchController;
   readonly browserTitleWithNotificationCount;
   readonly captcha;
@@ -102,6 +104,7 @@ export default class OsuCore {
     $.subscribe('user:update', this.onCurrentUserUpdate);
 
     this.animateNav = new AnimateNav();
+    this.bbcodeAutoPreview = new BbcodeAutoPreview();
     this.captcha = new Captcha();
     this.chatWorker = new ChatWorker();
     this.clickMenu = new ClickMenu();
diff --git a/resources/js/profile-page/cover.tsx b/resources/js/profile-page/cover.tsx
index d342b7ba233..ef2dddff87c 100644
--- a/resources/js/profile-page/cover.tsx
+++ b/resources/js/profile-page/cover.tsx
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import FlagCountry from 'components/flag-country';
+import FlagTeam from 'components/flag-team';
 import { Spinner } from 'components/spinner';
 import UserAvatar from 'components/user-avatar';
 import UserGroupBadges from 'components/user-group-badges';
@@ -87,12 +88,19 @@ export default class Cover extends React.Component<Props> {
                   className='profile-info__flag'
                   href={route('rankings', { country: this.props.user.country.code, mode: this.props.currentMode, type: 'performance' })}
                 >
-                  <span className='profile-info__flag-flag'>
-                    <FlagCountry country={this.props.user.country} />
-                  </span>
+                  <FlagCountry country={this.props.user.country} />
                   <span className='profile-info__flag-text'>{this.props.user.country.name}</span>
                 </a>
               }
+              {this.props.user.team != null &&
+                <a
+                  className='profile-info__flag'
+                  href={route('teams.show', { team: this.props.user.team.id })}
+                >
+                  <FlagTeam team={this.props.user.team} />
+                  <span className='profile-info__flag-text'>{this.props.user.team.name}</span>
+                </a>
+              }
               <div className='profile-info__icons profile-info__icons--flag-inline'>
                 {this.renderIcons()}
               </div>
diff --git a/resources/js/profile-page/daily-challenge.tsx b/resources/js/profile-page/daily-challenge.tsx
index 44cf465e2c4..abd07f6db93 100644
--- a/resources/js/profile-page/daily-challenge.tsx
+++ b/resources/js/profile-page/daily-challenge.tsx
@@ -4,6 +4,8 @@
 import DailyChallengeUserStatsJson from 'interfaces/daily-challenge-user-stats-json';
 import { autorun } from 'mobx';
 import { observer } from 'mobx-react';
+import * as moment from 'moment';
+import core from 'osu-core-singleton';
 import * as React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { classWithModifiers, Modifiers } from 'utils/css';
@@ -122,10 +124,13 @@ export default class DailyChallenge extends React.Component<Props> {
       return null;
     }
 
+    const playedToday = this.props.stats.last_update !== null && moment.utc(this.props.stats.last_update).isSame(Date.now(), 'day');
+    const userIsOnOwnProfile = this.props.stats.user_id === core.currentUser?.id;
+
     return (
       <div
         ref={this.valueRef}
-        className='daily-challenge'
+        className={classWithModifiers('daily-challenge', { 'played-today': playedToday && userIsOnOwnProfile })}
         onMouseOver={this.onMouseOver}
       >
         <div className='daily-challenge__name'>
diff --git a/resources/js/profile-page/main.tsx b/resources/js/profile-page/main.tsx
index 17123dab521..b891de44fca 100644
--- a/resources/js/profile-page/main.tsx
+++ b/resources/js/profile-page/main.tsx
@@ -120,37 +120,39 @@ export default class Main extends React.Component<Props> {
     // pageScan does not need to run at 144 fps...
     $(window).on(scrollEventId, throttle(() => this.pageScan(), 20));
 
-    if (this.pages.current != null) {
-      $(this.pages.current).sortable({
-        cursor: 'move',
-        handle: '.js-profile-page-extra--sortable-handle',
-        items: '.js-sortable--page',
-        revert: 150,
-        scrollSpeed: 10,
-        update: this.updateOrder,
-      });
-    }
+    this.disposers.add(core.reactTurbolinks.runAfterPageLoad(() => {
+      if (this.pages.current != null) {
+        $(this.pages.current).sortable({
+          cursor: 'move',
+          handle: '.js-profile-page-extra--sortable-handle',
+          items: '.js-sortable--page',
+          revert: 150,
+          scrollSpeed: 10,
+          update: this.updateOrder,
+        });
+      }
 
-    if (this.tabs.current != null) {
-      $(this.tabs.current).sortable({
-        axis: 'x',
-        cursor: 'move',
-        disabled: !this.controller.withEdit,
-        items: '.js-sortable--tab',
-        revert: 150,
-        scrollSpeed: 0,
-        start: () => {
-          // Somehow click event still goes through when dragging.
-          // This prevents triggering onTabClick.
-          window.clearTimeout(this.timeouts.draggingTab);
-          this.draggingTab = true;
-        },
-        stop: () => {
-          this.timeouts.draggingTab = window.setTimeout(() => this.draggingTab = false, 500);
-        },
-        update: this.updateOrder,
-      });
-    }
+      if (this.tabs.current != null) {
+        $(this.tabs.current).sortable({
+          axis: 'x',
+          cursor: 'move',
+          disabled: !this.controller.withEdit,
+          items: '.js-sortable--tab',
+          revert: 150,
+          scrollSpeed: 0,
+          start: () => {
+            // Somehow click event still goes through when dragging.
+            // This prevents triggering onTabClick.
+            window.clearTimeout(this.timeouts.draggingTab);
+            this.draggingTab = true;
+          },
+          stop: () => {
+            this.timeouts.draggingTab = window.setTimeout(() => this.draggingTab = false, 500);
+          },
+          update: this.updateOrder,
+        });
+      }
+    }));
 
     // preserve scroll if existing saved state but force position to reset
     // on refresh to avoid browser setting scroll position at the bottom on reload.
diff --git a/resources/js/quick-search/user.tsx b/resources/js/quick-search/user.tsx
index 6cd04f5858f..b391e6f9e0d 100644
--- a/resources/js/quick-search/user.tsx
+++ b/resources/js/quick-search/user.tsx
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 import FlagCountry from 'components/flag-country';
+import FlagTeam from 'components/flag-team';
 import FriendButton from 'components/friend-button';
 import SupporterIcon from 'components/supporter-icon';
 import UserGroupBadges from 'components/user-group-badges';
@@ -26,6 +27,12 @@ export default function User({ user, modifiers = [] }: { modifiers?: string[]; u
             <FlagCountry country={user.country} />
           </div>
 
+          {user.team != null &&
+            <div className='user-search-card__col user-search-card__col--flag'>
+              <FlagTeam team={user.team} />
+            </div>
+          }
+
           <a className='user-search-card__col user-search-card__col--username' href={url}>
             {user.username}
           </a>
diff --git a/resources/js/store/store-supporter-tag.tsx b/resources/js/store/store-supporter-tag.tsx
index 5e39f229e90..4db15f63c38 100644
--- a/resources/js/store/store-supporter-tag.tsx
+++ b/resources/js/store/store-supporter-tag.tsx
@@ -224,7 +224,7 @@ export default class StoreSupporterTag extends React.Component<Props> {
 
   @action
   private readonly getUser = (username: string) => {
-    this.xhr = apiLookupUsers([`@${username}`]);
+    this.xhr = apiLookupUsers([`@${username}`], true);
 
     this.xhr
       .done((response) => runInAction(() => {
diff --git a/resources/js/utils/user.ts b/resources/js/utils/user.ts
index a403709d51f..1345ac81dee 100644
--- a/resources/js/utils/user.ts
+++ b/resources/js/utils/user.ts
@@ -4,9 +4,9 @@
 import UserJson from 'interfaces/user-json';
 import { route } from 'laroute';
 
-export function apiLookupUsers(idsOrUsernames: (string | null | undefined)[]) {
+export function apiLookupUsers(idsOrUsernames: (string | null | undefined)[], excludeBots?: boolean) {
   return $.ajax(route('users.lookup'), {
-    data: { ids: idsOrUsernames },
+    data: { exclude_bots: excludeBots, ids: idsOrUsernames },
     dataType: 'json',
   }) as JQuery.jqXHR<{ users: UserJson[] }>;
 }
diff --git a/resources/lang/ar/admin.php b/resources/lang/ar/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ar/admin.php
+++ b/resources/lang/ar/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ar/beatmaps.php b/resources/lang/ar/beatmaps.php
index e1fe126fd5e..0b5a2a8c331 100644
--- a/resources/lang/ar/beatmaps.php
+++ b/resources/lang/ar/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'فشل تحديث التصويت',
diff --git a/resources/lang/ar/common.php b/resources/lang/ar/common.php
index 577d1b06673..6532043c9d9 100644
--- a/resources/lang/ar/common.php
+++ b/resources/lang/ar/common.php
@@ -22,6 +22,7 @@
         'admin' => 'المشرف',
         'authorise' => 'استأِذان',
         'authorising' => 'استأِذان...',
+        'back' => '',
         'back_to_previous' => 'العودة إلى الحالة السابقة',
         'back_to_top' => 'العودة إلى الأعلى',
         'cancel' => 'إلغاء',
diff --git a/resources/lang/ar/layout.php b/resources/lang/ar/layout.php
index 456c7a6fcc9..5f668f895cf 100644
--- a/resources/lang/ar/layout.php
+++ b/resources/lang/ar/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'الصفحة الشخصية',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ar/multiplayer.php b/resources/lang/ar/multiplayer.php
index 92ac2526c98..764434e2772 100644
--- a/resources/lang/ar/multiplayer.php
+++ b/resources/lang/ar/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'المدة طويلة جداً.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ar/page_title.php b/resources/lang/ar/page_title.php
index 98626759c31..9bade0547df 100644
--- a/resources/lang/ar/page_title.php
+++ b/resources/lang/ar/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'الترتيب',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'البطولات',
         ],
diff --git a/resources/lang/ar/teams.php b/resources/lang/ar/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ar/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/be/admin.php b/resources/lang/be/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/be/admin.php
+++ b/resources/lang/be/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/be/beatmaps.php b/resources/lang/be/beatmaps.php
index aafd0a377d4..2c4f650046f 100644
--- a/resources/lang/be/beatmaps.php
+++ b/resources/lang/be/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Не атрымалася абнавіць голас',
diff --git a/resources/lang/be/common.php b/resources/lang/be/common.php
index 7823eaa9509..e4a51f31044 100644
--- a/resources/lang/be/common.php
+++ b/resources/lang/be/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Кіраўнік',
         'authorise' => 'Аўтарызацыя',
         'authorising' => 'Аўтарызіруемся...',
+        'back' => '',
         'back_to_previous' => 'Вярнуцца ў папярэднюю пазіцыю',
         'back_to_top' => 'Вярнуцца ў пачатак',
         'cancel' => 'Скасаваць',
diff --git a/resources/lang/be/layout.php b/resources/lang/be/layout.php
index 223f5c80cf8..2531e576ea1 100644
--- a/resources/lang/be/layout.php
+++ b/resources/lang/be/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Мой профіль',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/be/multiplayer.php b/resources/lang/be/multiplayer.php
index f9209c000db..89034d4a4fd 100644
--- a/resources/lang/be/multiplayer.php
+++ b/resources/lang/be/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Вельмі вялікая працягласць.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/be/page_title.php b/resources/lang/be/page_title.php
index bb473617259..334f28eb47d 100644
--- a/resources/lang/be/page_title.php
+++ b/resources/lang/be/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'рэйтынг',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'турніры',
         ],
diff --git a/resources/lang/be/teams.php b/resources/lang/be/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/be/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/bg/admin.php b/resources/lang/bg/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/bg/admin.php
+++ b/resources/lang/bg/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/bg/authorization.php b/resources/lang/bg/authorization.php
index a89ea65e103..c284c01a096 100644
--- a/resources/lang/bg/authorization.php
+++ b/resources/lang/bg/authorization.php
@@ -5,7 +5,7 @@
 
 return [
     'play_more' => 'Защо не поиграете още osu! вместо това?',
-    'require_login' => 'Моля, влез в профила си, за да продължите.',
+    'require_login' => 'Моля, влезте в профила си, за да продължите.',
     'require_verification' => 'Моля, потвърди влизането си, за да продължите.',
     'restricted' => "Не може да правите това докато сте ограничени.",
     'silenced' => "Не може да правите това докато сте заглушени.",
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Трябва да поставиш резултат на бийтмап, за да добавяш етикет.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Само създателят на стаята може да я закрива.',
         ],
     ],
 
diff --git a/resources/lang/bg/beatmap_discussions.php b/resources/lang/bg/beatmap_discussions.php
index a0aa6b59861..56014bf92fa 100644
--- a/resources/lang/bg/beatmap_discussions.php
+++ b/resources/lang/bg/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Проверка за обновления...',
+        'has_updates' => 'Дискусията има актуализации, натисни за презареждане.',
+        'no_updates' => 'Няма актуализации.',
+        'updating' => 'Обновяване...',
     ],
 
     'reply' => [
diff --git a/resources/lang/bg/beatmaps.php b/resources/lang/bg/beatmaps.php
index fadcab0c465..f067146e319 100644
--- a/resources/lang/bg/beatmaps.php
+++ b/resources/lang/bg/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Неуспешно актуализиране на гласуването',
diff --git a/resources/lang/bg/common.php b/resources/lang/bg/common.php
index 99abed36f13..75db069350e 100644
--- a/resources/lang/bg/common.php
+++ b/resources/lang/bg/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Админ',
         'authorise' => 'Оторизирай',
         'authorising' => 'Оторизиране...',
+        'back' => '',
         'back_to_previous' => 'Връщане към предишния изглед',
         'back_to_top' => 'Обратно към началото',
         'cancel' => 'Отмяна',
diff --git a/resources/lang/bg/follows.php b/resources/lang/bg/follows.php
index 544f9c27ee1..ae090993424 100644
--- a/resources/lang/bg/follows.php
+++ b/resources/lang/bg/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Достигнахте лимита за последване.',
     ],
 ];
diff --git a/resources/lang/bg/forum.php b/resources/lang/bg/forum.php
index 3190ae333e6..eb229c0f7ea 100644
--- a/resources/lang/bg/forum.php
+++ b/resources/lang/bg/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Наистина ли възстановявате темата?',
         'deleted' => 'изтрита тема',
         'go_to_latest' => 'виж най-новата публикация',
-        'go_to_unread' => '',
+        'go_to_unread' => 'към първата непрочетена публикация',
         'has_replied' => 'Вече отговорихте на тази тема',
         'in_forum' => 'в :forum',
         'latest_post' => ':when от :user',
diff --git a/resources/lang/bg/layout.php b/resources/lang/bg/layout.php
index 27abd7ba1bd..0bc1baf3cc8 100644
--- a/resources/lang/bg/layout.php
+++ b/resources/lang/bg/layout.php
@@ -199,8 +199,9 @@
             'legacy_score_only_toggle_tooltip' => 'Lazer стилът показва резултатите от lazer по нов точков алгоритъм',
             'logout' => 'Изход',
             'profile' => 'Моят профил',
-            'scoring_mode_toggle' => '',
+            'scoring_mode_toggle' => 'Класически резултати',
             'scoring_mode_toggle_tooltip' => 'Коригира стойността на резултатите да се усеща като традиционното неограничено точкуване',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/bg/multiplayer.php b/resources/lang/bg/multiplayer.php
index 23532ca4236..4f311d70352 100644
--- a/resources/lang/bg/multiplayer.php
+++ b/resources/lang/bg/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Прекалено голяма продължителност.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/bg/page_title.php b/resources/lang/bg/page_title.php
index 8733327c0fd..81a1252b7fe 100644
--- a/resources/lang/bg/page_title.php
+++ b/resources/lang/bg/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'класации',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'турнири',
         ],
diff --git a/resources/lang/bg/rankings.php b/resources/lang/bg/rankings.php
index cb614b0004b..83e87d4a7dd 100644
--- a/resources/lang/bg/rankings.php
+++ b/resources/lang/bg/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Трудност',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Топ 10% резултати ',
+        'top_50p' => 'Топ 50% резултати ',
     ],
 
     'filter' => [
diff --git a/resources/lang/bg/teams.php b/resources/lang/bg/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/bg/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/bg/users.php b/resources/lang/bg/users.php
index 6a57cf61d47..fecf18c674f 100644
--- a/resources/lang/bg/users.php
+++ b/resources/lang/bg/users.php
@@ -197,20 +197,20 @@
             'to_1' => 'показване на корицата',
         ],
         'daily_challenge' => [
-            'daily' => '',
-            'daily_streak_best' => '',
-            'daily_streak_current' => '',
-            'playcount' => '',
-            'title' => '',
-            'top_10p_placements' => '',
-            'top_50p_placements' => '',
+            'daily' => 'Ежедневна серия',
+            'daily_streak_best' => 'Най-добра ежедневна серия ',
+            'daily_streak_current' => 'Сегашна ежедневна серия ',
+            'playcount' => 'Общо участия',
+            'title' => 'Дневно\nПредизвикателство',
+            'top_10p_placements' => 'Топ 10% резултати ',
+            'top_50p_placements' => 'Топ 50% резултати',
             'weekly' => 'Седмична поредица',
             'weekly_streak_best' => 'Най-добра седмична поредица',
             'weekly_streak_current' => 'Текуща седмична поредица',
 
             'unit' => [
-                'day' => '',
-                'week' => '',
+                'day' => ':valueд',
+                'week' => ':valueседм',
             ],
         ],
         'edit' => [
diff --git a/resources/lang/ca/admin.php b/resources/lang/ca/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ca/admin.php
+++ b/resources/lang/ca/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ca/beatmaps.php b/resources/lang/ca/beatmaps.php
index ec365826472..0185aae4acd 100644
--- a/resources/lang/ca/beatmaps.php
+++ b/resources/lang/ca/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Error en actualitzar el vot',
diff --git a/resources/lang/ca/common.php b/resources/lang/ca/common.php
index 4acb51ed98e..a2d1189121f 100644
--- a/resources/lang/ca/common.php
+++ b/resources/lang/ca/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrador',
         'authorise' => 'Autoritzar',
         'authorising' => 'Autoritzant...',
+        'back' => '',
         'back_to_previous' => 'Tornar a la posició anterior',
         'back_to_top' => 'Torna al principi',
         'cancel' => 'Cancel·la',
diff --git a/resources/lang/ca/layout.php b/resources/lang/ca/layout.php
index 3c15dbc75d8..1cb05bef906 100644
--- a/resources/lang/ca/layout.php
+++ b/resources/lang/ca/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'El meu perfil',
             'scoring_mode_toggle' => 'Puntuació clàssica',
             'scoring_mode_toggle_tooltip' => 'Ajusta els valors de la puntuació per a simular la puntuació clàssic sense límits.',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ca/multiplayer.php b/resources/lang/ca/multiplayer.php
index e958dd61d51..4ac561cf062 100644
--- a/resources/lang/ca/multiplayer.php
+++ b/resources/lang/ca/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'La durada és massa llarga.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ca/page_title.php b/resources/lang/ca/page_title.php
index 4f55cb55dfb..5c230201b4d 100644
--- a/resources/lang/ca/page_title.php
+++ b/resources/lang/ca/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'classificacions',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'tornejos',
         ],
diff --git a/resources/lang/ca/teams.php b/resources/lang/ca/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ca/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/cs/admin.php b/resources/lang/cs/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/cs/admin.php
+++ b/resources/lang/cs/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/cs/authorization.php b/resources/lang/cs/authorization.php
index 3e9edd3c71a..6e0f6ece632 100644
--- a/resources/lang/cs/authorization.php
+++ b/resources/lang/cs/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Pro přidání tagu musíš na beatmapě zahrát skóre.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Pouze vlastník místnosti ji může zavřít.',
         ],
     ],
 
diff --git a/resources/lang/cs/beatmap_discussions.php b/resources/lang/cs/beatmap_discussions.php
index 154fc29de24..d04e021f4d3 100644
--- a/resources/lang/cs/beatmap_discussions.php
+++ b/resources/lang/cs/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Hledání aktualizací...',
+        'has_updates' => 'Diskuze byla aktualizována, klikni pro obnovení.',
+        'no_updates' => 'Žádné aktualizace.',
+        'updating' => 'Aktualizování...',
     ],
 
     'reply' => [
diff --git a/resources/lang/cs/beatmaps.php b/resources/lang/cs/beatmaps.php
index 377a9a97b62..96b9c4f0c82 100644
--- a/resources/lang/cs/beatmaps.php
+++ b/resources/lang/cs/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Nastala chyba během hlasování',
diff --git a/resources/lang/cs/common.php b/resources/lang/cs/common.php
index 52e4bdd3d34..70af3d3f44e 100644
--- a/resources/lang/cs/common.php
+++ b/resources/lang/cs/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autorizovat',
         'authorising' => 'Autorizování...',
+        'back' => '',
         'back_to_previous' => 'Zpátky na předchozí pozici',
         'back_to_top' => 'Zpátky nahoru',
         'cancel' => 'Zrušit',
diff --git a/resources/lang/cs/follows.php b/resources/lang/cs/follows.php
index 279a4e6c06d..5908e688884 100644
--- a/resources/lang/cs/follows.php
+++ b/resources/lang/cs/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Dosažen limit počtu sledovaných.',
     ],
 ];
diff --git a/resources/lang/cs/forum.php b/resources/lang/cs/forum.php
index 1920fc8fb9b..4f902459abe 100644
--- a/resources/lang/cs/forum.php
+++ b/resources/lang/cs/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Opravdu checeš obnovit téma?',
         'deleted' => 'odstraněné téma',
         'go_to_latest' => 'zobrazit nejnovější příspěvek',
-        'go_to_unread' => '',
+        'go_to_unread' => 'zobrazit první nepřečtený příspěvek',
         'has_replied' => 'Odpověděl jsi na toto téma',
         'in_forum' => 'v :forum',
         'latest_post' => ':when uživatelem :user',
diff --git a/resources/lang/cs/layout.php b/resources/lang/cs/layout.php
index e7cf969a982..73e1d3e38e7 100644
--- a/resources/lang/cs/layout.php
+++ b/resources/lang/cs/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Můj profil',
             'scoring_mode_toggle' => 'Klasické skórování',
             'scoring_mode_toggle_tooltip' => 'Upravit hodnoty skóre tak, aby se více podobaly klasickému neomezenému skórování',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/cs/multiplayer.php b/resources/lang/cs/multiplayer.php
index d2c16f68396..33a603fddb8 100644
--- a/resources/lang/cs/multiplayer.php
+++ b/resources/lang/cs/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Doba je příliě dlouhá.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/cs/page_title.php b/resources/lang/cs/page_title.php
index f8762bf2030..e59c4f81587 100644
--- a/resources/lang/cs/page_title.php
+++ b/resources/lang/cs/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'hodnocení',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnaje',
         ],
diff --git a/resources/lang/cs/rankings.php b/resources/lang/cs/rankings.php
index b42f3a40ec2..9063a5a4e74 100644
--- a/resources/lang/cs/rankings.php
+++ b/resources/lang/cs/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Obtížnost',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Skóre pro Top 10%',
+        'top_50p' => 'Skóre pro Top 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/cs/teams.php b/resources/lang/cs/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/cs/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/da/admin.php b/resources/lang/da/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/da/admin.php
+++ b/resources/lang/da/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/da/authorization.php b/resources/lang/da/authorization.php
index 1474a521396..6d58c6b24fc 100644
--- a/resources/lang/da/authorization.php
+++ b/resources/lang/da/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Du skal sætte en score på et beatmap for at tilføje et tag.',
         ],
     ],
 
diff --git a/resources/lang/da/beatmaps.php b/resources/lang/da/beatmaps.php
index e20d2cd11fa..5e6b83aa2a2 100644
--- a/resources/lang/da/beatmaps.php
+++ b/resources/lang/da/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Kunne ikke afgive stemme',
@@ -81,12 +85,12 @@
         ],
 
         'message_type_title' => [
-            'disqualify' => '',
-            'hype' => '',
-            'mapper_note' => '',
-            'nomination_reset' => '',
-            'praise' => '',
-            'problem' => '',
+            'disqualify' => 'Post Diskvalifikation',
+            'hype' => 'Post Hype!',
+            'mapper_note' => 'Post Notat',
+            'nomination_reset' => 'Fjern alle nominationer',
+            'praise' => 'Post Ros',
+            'problem' => 'Post Problem',
             'problem_warning' => '',
             'review' => '',
             'suggestion' => '',
diff --git a/resources/lang/da/beatmapsets.php b/resources/lang/da/beatmapsets.php
index f765e74b70f..b907337d2ea 100644
--- a/resources/lang/da/beatmapsets.php
+++ b/resources/lang/da/beatmapsets.php
@@ -42,10 +42,10 @@
 
     'nominate' => [
         'bng_limited_too_many_rulesets' => '',
-        'full_nomination_required' => '',
+        'full_nomination_required' => 'Du skal være en fuld nominator for at udføre en rulesets sidste nomination.',
         'hybrid_requires_modes' => 'Et hybrid beatmap kræver at du vælger mindst en spilletilstand at nominere til.',
         'incorrect_mode' => 'Du har ikke tilladelse til at nominere for tilstand: :mode',
-        'invalid_limited_nomination' => '',
+        'invalid_limited_nomination' => 'Dette beatmap har ugyldige nominationer og kan ikke kvalificeres i denne tilstand.',
         'invalid_ruleset' => '',
         'too_many' => 'Nomineringskravet er allerede opfyldt.',
         'too_many_non_main_ruleset' => '',
diff --git a/resources/lang/da/common.php b/resources/lang/da/common.php
index c92f50bf2c9..ea23bf76062 100644
--- a/resources/lang/da/common.php
+++ b/resources/lang/da/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autoriser',
         'authorising' => 'Autoriserer...',
+        'back' => '',
         'back_to_previous' => 'Vend tilbage til tidligere position',
         'back_to_top' => 'Tilbage til toppen',
         'cancel' => 'Annullér',
diff --git a/resources/lang/da/layout.php b/resources/lang/da/layout.php
index 316787cdc2b..49d11f8a95f 100644
--- a/resources/lang/da/layout.php
+++ b/resources/lang/da/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Min Profil',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/da/multiplayer.php b/resources/lang/da/multiplayer.php
index c5a920db28c..441808baafe 100644
--- a/resources/lang/da/multiplayer.php
+++ b/resources/lang/da/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Varigheden er for lang.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/da/page_title.php b/resources/lang/da/page_title.php
index 7a6ab523111..4485b2c2d7d 100644
--- a/resources/lang/da/page_title.php
+++ b/resources/lang/da/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turneringer',
         ],
diff --git a/resources/lang/da/teams.php b/resources/lang/da/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/da/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/de/admin.php b/resources/lang/de/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/de/admin.php
+++ b/resources/lang/de/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/de/authorization.php b/resources/lang/de/authorization.php
index 52d970f3d42..7ff391c4abf 100644
--- a/resources/lang/de/authorization.php
+++ b/resources/lang/de/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Du musst einen Score auf einer Beatmap erreichen, um einen Tag hinzuzufügen.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Nur der Raumeigentümer kann den Raum schließen.',
         ],
     ],
 
diff --git a/resources/lang/de/beatmap_discussions.php b/resources/lang/de/beatmap_discussions.php
index a2c63489215..f2deb724d95 100644
--- a/resources/lang/de/beatmap_discussions.php
+++ b/resources/lang/de/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Prüfe auf Updates...',
+        'has_updates' => 'Klicke, um die Aktualisierungen der Diskussion zu laden.',
+        'no_updates' => 'Keine Updates.',
+        'updating' => 'Aktualisiere...',
     ],
 
     'reply' => [
diff --git a/resources/lang/de/beatmaps.php b/resources/lang/de/beatmaps.php
index 3659c7bb43c..83b3c56cc8e 100644
--- a/resources/lang/de/beatmaps.php
+++ b/resources/lang/de/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Aktualisieren der Stimme fehlgeschlagen',
diff --git a/resources/lang/de/common.php b/resources/lang/de/common.php
index b09c19ad989..e0eef6a4ca1 100644
--- a/resources/lang/de/common.php
+++ b/resources/lang/de/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autorisieren',
         'authorising' => 'Autorisieren...',
+        'back' => '',
         'back_to_previous' => 'Zur vorherigen Position zurückkehren',
         'back_to_top' => 'Zurück zum Seitenanfang',
         'cancel' => 'Abbrechen',
diff --git a/resources/lang/de/follows.php b/resources/lang/de/follows.php
index 7450d1b9fe7..c6dc99267d3 100644
--- a/resources/lang/de/follows.php
+++ b/resources/lang/de/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Followerlimit erreicht.',
     ],
 ];
diff --git a/resources/lang/de/forum.php b/resources/lang/de/forum.php
index 256ecc28657..5b87ecdd76d 100644
--- a/resources/lang/de/forum.php
+++ b/resources/lang/de/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Thread wirklich wiederherstellen?',
         'deleted' => 'gelöschter Thread',
         'go_to_latest' => 'letzte Antwort anschauen',
-        'go_to_unread' => '',
+        'go_to_unread' => 'Zeige ersten ungelesenen Beitrag',
         'has_replied' => 'Du hast auf diesen Thread geantwortet',
         'in_forum' => 'in :forum',
         'latest_post' => ':when von :user',
diff --git a/resources/lang/de/layout.php b/resources/lang/de/layout.php
index 835cbf5beb1..2a60fd9c32a 100644
--- a/resources/lang/de/layout.php
+++ b/resources/lang/de/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mein Profil',
             'scoring_mode_toggle' => 'Klassisches Punktesystem',
             'scoring_mode_toggle_tooltip' => 'Punktestände entsprechen dem klassischen, unbegrenzten Punktesystem',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/de/multiplayer.php b/resources/lang/de/multiplayer.php
index 9663cb07b71..6e91e87eff0 100644
--- a/resources/lang/de/multiplayer.php
+++ b/resources/lang/de/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Die Dauer ist zu lang.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/de/page_title.php b/resources/lang/de/page_title.php
index 13770d2ffbf..63f44a227a5 100644
--- a/resources/lang/de/page_title.php
+++ b/resources/lang/de/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'Ranglisten',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'Turniere',
         ],
diff --git a/resources/lang/de/rankings.php b/resources/lang/de/rankings.php
index 2ac84611843..19293fdc962 100644
--- a/resources/lang/de/rankings.php
+++ b/resources/lang/de/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Level',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => '90%-Perzentil',
+        'top_50p' => 'Median',
     ],
 
     'filter' => [
diff --git a/resources/lang/de/teams.php b/resources/lang/de/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/de/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/el/admin.php b/resources/lang/el/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/el/admin.php
+++ b/resources/lang/el/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/el/beatmaps.php b/resources/lang/el/beatmaps.php
index ad7dcaa24d4..cb01b1e556c 100644
--- a/resources/lang/el/beatmaps.php
+++ b/resources/lang/el/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Αποτυχία ενημέρωσης ψήφων',
diff --git a/resources/lang/el/common.php b/resources/lang/el/common.php
index a5540882c78..2abb3d57b0b 100644
--- a/resources/lang/el/common.php
+++ b/resources/lang/el/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Διαχειριστής',
         'authorise' => 'Εξουσιοδότηση',
         'authorising' => 'Εξουσιοδότηση...',
+        'back' => '',
         'back_to_previous' => 'Επιστροφή στην προηγούμενη κατάσταση',
         'back_to_top' => 'Πίσω στην αρχή',
         'cancel' => 'Ακύρωση',
diff --git a/resources/lang/el/layout.php b/resources/lang/el/layout.php
index 6e0f6455e97..61fc8fad7f9 100644
--- a/resources/lang/el/layout.php
+++ b/resources/lang/el/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Το Προφίλ μου',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/el/multiplayer.php b/resources/lang/el/multiplayer.php
index 61c1fb6f4f4..7618b272f43 100644
--- a/resources/lang/el/multiplayer.php
+++ b/resources/lang/el/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Η διάρκεια είναι πολύ μεγάλη.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/el/page_title.php b/resources/lang/el/page_title.php
index 2bcf74402c5..b5c5f29c3ba 100644
--- a/resources/lang/el/page_title.php
+++ b/resources/lang/el/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'κατατάξεις',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'πρωταθλήματα',
         ],
diff --git a/resources/lang/el/teams.php b/resources/lang/el/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/el/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/en/authorization.php b/resources/lang/en/authorization.php
index 046abae50ea..ba061ef6ccf 100644
--- a/resources/lang/en/authorization.php
+++ b/resources/lang/en/authorization.php
@@ -191,6 +191,13 @@
         ],
     ],
 
+    'team' => [
+        'part' => [
+            'is_leader' => "Team leader can't leave the team.",
+            'not_member' => 'Not a member of the team.',
+        ],
+    ],
+
     'user' => [
         'page' => [
             'edit' => [
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index 5bb26369a5a..4441277b1e0 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Authorise',
         'authorising' => 'Authorising...',
+        'back' => 'Back',
         'back_to_previous' => 'Return to previous position',
         'back_to_top' => 'Back to top',
         'cancel' => 'Cancel',
diff --git a/resources/lang/en/layout.php b/resources/lang/en/layout.php
index bc588a750e4..a11913b6ab6 100644
--- a/resources/lang/en/layout.php
+++ b/resources/lang/en/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'My Profile',
             'scoring_mode_toggle' => 'Classic scoring',
             'scoring_mode_toggle_tooltip' => 'Adjust score values to feel more like classic uncapped scoring',
+            'team' => 'My Team',
         ],
     ],
 
diff --git a/resources/lang/en/teams.php b/resources/lang/en/teams.php
index 82726a24f1a..a3984e14dff 100644
--- a/resources/lang/en/teams.php
+++ b/resources/lang/en/teams.php
@@ -4,9 +4,74 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'destroy' => [
+        'ok' => 'Team removed',
+    ],
+
+    'edit' => [
+        'saved' => 'Settings saved successfully',
+        'title' => 'Team Settings',
+
+        'description' => [
+            'label' => 'Description',
+            'title' => 'Team Description',
+        ],
+
+        'header' => [
+            'label' => 'Header Image',
+            'title' => 'Set Header Image',
+        ],
+
+        'logo' => [
+            'label' => 'Team Flag',
+            'title' => 'Set Team Flag',
+        ],
+
+        'settings' => [
+            'application' => 'Team Application',
+            'application_help' => 'Whether to allow people to apply for the team',
+            'default_ruleset' => 'Default Ruleset',
+            'default_ruleset_help' => 'The ruleset to be selected by default when visiting the team page',
+            'title' => 'Team Settings',
+            'url' => 'URL',
+
+            'application_state' => [
+                'state_0' => 'Closed',
+                'state_1' => 'Open',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => 'Team member removed',
+        ],
+
+        'index' => [
+            'title' => 'Manage Members',
+
+            'table' => [
+                'status' => 'Status',
+                'joined_at' => 'Join Date',
+                'remove' => 'Remove',
+                'title' => 'Current Members',
+            ],
+
+            'status' => [
+                'status_0' => 'Inactive',
+                'status_1' => 'Active',
+            ],
+        ],
+    ],
+
+    'part' => [
+        'ok' => 'Left the team ;_;',
+    ],
+
     'show' => [
         'bar' => [
-            'settings' => 'Settings',
+            'destroy' => 'Disband Team',
+            'part' => 'Leave Team',
         ],
 
         'info' => [
diff --git a/resources/lang/es-419/admin.php b/resources/lang/es-419/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/es-419/admin.php
+++ b/resources/lang/es-419/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/es-419/authorization.php b/resources/lang/es-419/authorization.php
index b5bea22dbca..f31bfb2c4c3 100644
--- a/resources/lang/es-419/authorization.php
+++ b/resources/lang/es-419/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Debes establecer una puntuación en un mapa para añadir una etiqueta.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Solo el propietario de la sala puede cerrarla.',
         ],
     ],
 
diff --git a/resources/lang/es-419/beatmap_discussions.php b/resources/lang/es-419/beatmap_discussions.php
index c38e8dce0e3..c1fe17c9639 100644
--- a/resources/lang/es-419/beatmap_discussions.php
+++ b/resources/lang/es-419/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Buscando actualizaciones...',
+        'has_updates' => 'La discusión tiene nuevas actualizaciones, haz clic para actualizar.',
+        'no_updates' => 'No hay actualizaciones.',
+        'updating' => 'Actualizando...',
     ],
 
     'reply' => [
diff --git a/resources/lang/es-419/beatmaps.php b/resources/lang/es-419/beatmaps.php
index 40265750650..7905183d632 100644
--- a/resources/lang/es-419/beatmaps.php
+++ b/resources/lang/es-419/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Error al actualizar los votos',
diff --git a/resources/lang/es-419/common.php b/resources/lang/es-419/common.php
index 42c4c7982f7..a6196f1cda3 100644
--- a/resources/lang/es-419/common.php
+++ b/resources/lang/es-419/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrador',
         'authorise' => 'Autorizar',
         'authorising' => 'Autorizando...',
+        'back' => '',
         'back_to_previous' => 'Volver a la posición anterior',
         'back_to_top' => 'Volver al principio',
         'cancel' => 'Cancelar',
diff --git a/resources/lang/es-419/follows.php b/resources/lang/es-419/follows.php
index 4e6b1d11540..74c8ec8e7ee 100644
--- a/resources/lang/es-419/follows.php
+++ b/resources/lang/es-419/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Has alcanzado el límite de personas a las que puedes seguir.',
     ],
 ];
diff --git a/resources/lang/es-419/forum.php b/resources/lang/es-419/forum.php
index c81535f2201..954487c53f2 100644
--- a/resources/lang/es-419/forum.php
+++ b/resources/lang/es-419/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => '¿Quieres restaurar el tema?',
         'deleted' => 'tema eliminado',
         'go_to_latest' => 'ver la última publicación',
-        'go_to_unread' => '',
+        'go_to_unread' => 'ver la primera publicación no leída',
         'has_replied' => 'Has respondido a este tema',
         'in_forum' => 'en :forum',
         'latest_post' => ':when por :user',
diff --git a/resources/lang/es-419/layout.php b/resources/lang/es-419/layout.php
index a5f776ba92c..ddab995d36d 100644
--- a/resources/lang/es-419/layout.php
+++ b/resources/lang/es-419/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mi perfil',
             'scoring_mode_toggle' => 'Puntuación clásica',
             'scoring_mode_toggle_tooltip' => 'Ajusta los valores de las puntuaciones para que se parezcan más a las puntuaciones clásicas sin límite',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/es-419/multiplayer.php b/resources/lang/es-419/multiplayer.php
index d37c88a4819..c9e47158afd 100644
--- a/resources/lang/es-419/multiplayer.php
+++ b/resources/lang/es-419/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'La duración es demasiado larga.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/es-419/page_title.php b/resources/lang/es-419/page_title.php
index d366a025f23..57856a88860 100644
--- a/resources/lang/es-419/page_title.php
+++ b/resources/lang/es-419/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'clasificaciones',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'torneos',
         ],
diff --git a/resources/lang/es-419/rankings.php b/resources/lang/es-419/rankings.php
index c7bb2138dcb..33da573a64b 100644
--- a/resources/lang/es-419/rankings.php
+++ b/resources/lang/es-419/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Dificultad',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Puntuación del top 10 %',
+        'top_50p' => 'Puntuación del top 50 %',
     ],
 
     'filter' => [
diff --git a/resources/lang/es-419/teams.php b/resources/lang/es-419/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/es-419/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/es/admin.php b/resources/lang/es/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/es/admin.php
+++ b/resources/lang/es/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/es/authorization.php b/resources/lang/es/authorization.php
index 0989d26eb0f..e26296d358a 100644
--- a/resources/lang/es/authorization.php
+++ b/resources/lang/es/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Debes establecer una puntuación en un mapa para añadir una etiqueta.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Solo el propietario de la sala puede cerrarla.',
         ],
     ],
 
diff --git a/resources/lang/es/beatmap_discussions.php b/resources/lang/es/beatmap_discussions.php
index c23ba423ffd..5b3ed1757e8 100644
--- a/resources/lang/es/beatmap_discussions.php
+++ b/resources/lang/es/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Buscando actualizaciones...',
+        'has_updates' => 'La discusión tiene nuevas actualizaciones, haz clic para actualizar.',
+        'no_updates' => 'No hay actualizaciones.',
+        'updating' => 'Actualizando...',
     ],
 
     'reply' => [
diff --git a/resources/lang/es/beatmaps.php b/resources/lang/es/beatmaps.php
index 855451fce20..baa91e8e79f 100644
--- a/resources/lang/es/beatmaps.php
+++ b/resources/lang/es/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Error al actualizar los votos',
diff --git a/resources/lang/es/common.php b/resources/lang/es/common.php
index 7aaf33c3726..66f0f0ae5e0 100644
--- a/resources/lang/es/common.php
+++ b/resources/lang/es/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrador',
         'authorise' => 'Autorizar',
         'authorising' => 'Autorizando...',
+        'back' => '',
         'back_to_previous' => 'Volver a la última posición',
         'back_to_top' => 'Volver al principio',
         'cancel' => 'Cancelar',
diff --git a/resources/lang/es/follows.php b/resources/lang/es/follows.php
index f626b234e7b..b7853046869 100644
--- a/resources/lang/es/follows.php
+++ b/resources/lang/es/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Has alcanzado el límite de personas a las que puedes seguir.',
     ],
 ];
diff --git a/resources/lang/es/forum.php b/resources/lang/es/forum.php
index f69fb9589ab..e706b3db0ed 100644
--- a/resources/lang/es/forum.php
+++ b/resources/lang/es/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => '¿Realmente desea restaurar el tema?',
         'deleted' => 'tema eliminado',
         'go_to_latest' => 'ver la última publicación',
-        'go_to_unread' => '',
+        'go_to_unread' => 'ver la primera publicación no leída',
         'has_replied' => 'Has respondido a este tema',
         'in_forum' => 'en :forum',
         'latest_post' => ':when por :user',
diff --git a/resources/lang/es/layout.php b/resources/lang/es/layout.php
index 9a9e1f64738..1276c3cc87f 100644
--- a/resources/lang/es/layout.php
+++ b/resources/lang/es/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mi perfil',
             'scoring_mode_toggle' => 'Puntuación clásica',
             'scoring_mode_toggle_tooltip' => 'Ajusta los valores de las puntuaciones para que se parezcan más a las puntuaciones clásicas sin límite',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/es/multiplayer.php b/resources/lang/es/multiplayer.php
index 74255a0c615..e5f12b4ea2d 100644
--- a/resources/lang/es/multiplayer.php
+++ b/resources/lang/es/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'La duración es demasiado larga.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/es/page_title.php b/resources/lang/es/page_title.php
index fae57784bc8..8c9c73e6455 100644
--- a/resources/lang/es/page_title.php
+++ b/resources/lang/es/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'clasificaciones',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'torneos',
         ],
diff --git a/resources/lang/es/rankings.php b/resources/lang/es/rankings.php
index 1048b659243..f09a29df56c 100644
--- a/resources/lang/es/rankings.php
+++ b/resources/lang/es/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Dificultad',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Puntuación del top 10 %',
+        'top_50p' => 'Puntuación del top 50 %',
     ],
 
     'filter' => [
diff --git a/resources/lang/es/teams.php b/resources/lang/es/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/es/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/fa-IR/accounts.php b/resources/lang/fa-IR/accounts.php
index 786022c173f..ab763f4ff7e 100644
--- a/resources/lang/fa-IR/accounts.php
+++ b/resources/lang/fa-IR/accounts.php
@@ -10,7 +10,7 @@
 
         'avatar' => [
             'title' => 'اکس پرفایل',
-            'reset' => '',
+            'reset' => 'بازنشانی',
             'rules' => 'لطفا مطمئن شوید که تصویر نمایه شما به :link پایبند است.<br/>این بدین معنیست که باید <strong>برای تمامی سنین مناسب باشد</strong> یعنی بدون برهنگی ، فحاشی یا محتوای وسوسه انگیز.',
             'rules_link' => 'قانون ها',
         ],
@@ -20,15 +20,15 @@
             'new_confirmation' => 'تایید ایمیل',
             'title' => 'ایمیل',
             'locked' => [
-                '_' => '',
-                'accounts' => '',
+                '_' => 'اگر میخواهید ایمیل خود را بروز کنید، لطفا با :accounts صحبت کنید.',
+                'accounts' => 'تیم پشتیبانی حساب های کاربری',
             ],
         ],
 
         'legacy_api' => [
-            'api' => '',
+            'api' => 'واسط برنامه‌نویسی نرم‌افزار',
             'irc' => '',
-            'title' => '',
+            'title' => 'واسط برنامه‌نویسی نرم‌افزار قدیمی',
         ],
 
         'password' => [
@@ -39,12 +39,12 @@
         ],
 
         'profile' => [
-            'country' => '',
+            'country' => 'کشور',
             'title' => 'نمایه',
 
             'country_change' => [
-                '_' => "",
-                'update_link' => '',
+                '_' => "بنظر میرسد که کشور ثبت شده حساب شما با کشور اقامت شما تطابق ندارد. :update_link.",
+                'update_link' => 'بروز رسانی به :country',
             ],
 
             'user' => [
@@ -64,14 +64,14 @@
     ],
 
     'github_user' => [
-        'info' => "",
-        'link' => '',
-        'title' => '',
-        'unlink' => '',
+        'info' => "اگر در مخازن منبع باز osu مشارکت می کنید، با پیوند دادن حساب GitHub خود به اینجا، لاگ تغییرات شما به نمایه osu شما متصل می شود. نمایه حساب‌های GitHub که سابقه مشارکت در osu! ندارند را نمی توان پیوند داد.",
+        'link' => 'پیوند دادن حساب GitHub',
+        'title' => 'گیت‌هاب',
+        'unlink' => 'لغو پیوند حساب GitHub',
 
         'error' => [
-            'already_linked' => '',
-            'no_contribution' => '',
+            'already_linked' => 'این حساب گیت‌هاب به نمایه شخص دیگری متصل شده است.',
+            'no_contribution' => 'نمی توان حساب گیت‌هابی که سابقه کمک به مخازن osu! نداشته را متصل کرد.',
             'unverified_email' => '',
         ],
     ],
diff --git a/resources/lang/fa-IR/admin.php b/resources/lang/fa-IR/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/fa-IR/admin.php
+++ b/resources/lang/fa-IR/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/fa-IR/beatmaps.php b/resources/lang/fa-IR/beatmaps.php
index e3a996cfe91..993131868b9 100644
--- a/resources/lang/fa-IR/beatmaps.php
+++ b/resources/lang/fa-IR/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'شکست در بروز کردن رای',
diff --git a/resources/lang/fa-IR/common.php b/resources/lang/fa-IR/common.php
index d7ce03f447f..4de797f70f1 100644
--- a/resources/lang/fa-IR/common.php
+++ b/resources/lang/fa-IR/common.php
@@ -22,6 +22,7 @@
         'admin' => '',
         'authorise' => '',
         'authorising' => '',
+        'back' => '',
         'back_to_previous' => '',
         'back_to_top' => '',
         'cancel' => '',
diff --git a/resources/lang/fa-IR/layout.php b/resources/lang/fa-IR/layout.php
index fc954ef73e9..b26b3a48d45 100644
--- a/resources/lang/fa-IR/layout.php
+++ b/resources/lang/fa-IR/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'پروفایل من',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/fa-IR/multiplayer.php b/resources/lang/fa-IR/multiplayer.php
index dc8c7f1e291..4c473b88477 100644
--- a/resources/lang/fa-IR/multiplayer.php
+++ b/resources/lang/fa-IR/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/fa-IR/page_title.php b/resources/lang/fa-IR/page_title.php
index 2a6fbe54c4f..eb369e9f541 100644
--- a/resources/lang/fa-IR/page_title.php
+++ b/resources/lang/fa-IR/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/fa-IR/teams.php b/resources/lang/fa-IR/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/fa-IR/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/fi/admin.php b/resources/lang/fi/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/fi/admin.php
+++ b/resources/lang/fi/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/fi/beatmaps.php b/resources/lang/fi/beatmaps.php
index 2bd11f9186b..1819bebc78f 100644
--- a/resources/lang/fi/beatmaps.php
+++ b/resources/lang/fi/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Äänen päivitys ei onnistunut',
diff --git a/resources/lang/fi/common.php b/resources/lang/fi/common.php
index f43667ce367..a11c616ed67 100644
--- a/resources/lang/fi/common.php
+++ b/resources/lang/fi/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Ylläpitäjä',
         'authorise' => 'Valtuuta',
         'authorising' => 'Valtuutetaan...',
+        'back' => '',
         'back_to_previous' => 'Takaisin',
         'back_to_top' => 'Takaisin ylös',
         'cancel' => 'Peruuta',
diff --git a/resources/lang/fi/layout.php b/resources/lang/fi/layout.php
index 6d69b22e327..2bbc7f9fff9 100644
--- a/resources/lang/fi/layout.php
+++ b/resources/lang/fi/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Oma profiili',
             'scoring_mode_toggle' => 'Klassinen pisteytys',
             'scoring_mode_toggle_tooltip' => 'Säädä pistemäärät tuntumaan enemmän klassiselta rajoittamattomalta pisteytykseltä',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/fi/multiplayer.php b/resources/lang/fi/multiplayer.php
index bf4ec4cca1d..cf9a31159e0 100644
--- a/resources/lang/fi/multiplayer.php
+++ b/resources/lang/fi/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Liian pitkä aika.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/fi/page_title.php b/resources/lang/fi/page_title.php
index 0bf436d1dce..655b2e8ae86 100644
--- a/resources/lang/fi/page_title.php
+++ b/resources/lang/fi/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'tilastot',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnaukset',
         ],
diff --git a/resources/lang/fi/teams.php b/resources/lang/fi/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/fi/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/fil/admin.php b/resources/lang/fil/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/fil/admin.php
+++ b/resources/lang/fil/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/fil/authorization.php b/resources/lang/fil/authorization.php
index ec4a1b85eac..730a09a17b1 100644
--- a/resources/lang/fil/authorization.php
+++ b/resources/lang/fil/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Dapat may iskor ka sa beatmap na ito upang malagyan ng tag.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Tanging may-ari ng room na ito ang makakapagsara.',
         ],
     ],
 
diff --git a/resources/lang/fil/beatmaps.php b/resources/lang/fil/beatmaps.php
index 2aed58454cc..508c65eb1ca 100644
--- a/resources/lang/fil/beatmaps.php
+++ b/resources/lang/fil/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Nabigong i-update ang boto',
@@ -16,7 +20,7 @@
         'delete' => 'tanggalin',
         'deleted' => 'Tinanggal ni :editor :delete_time.',
         'deny_kudosu' => 'itanggi ang kudosu',
-        'edit' => 'I-edit',
+        'edit' => 'baguhin',
         'edited' => 'Huling na-edit ni :editor :update_time.',
         'guest' => 'Guest difficulty ni :user',
         'kudosu_denied' => 'Natanggi sa pagtamo ng kudosu.',
diff --git a/resources/lang/fil/common.php b/resources/lang/fil/common.php
index dee4692943f..529abebae0c 100644
--- a/resources/lang/fil/common.php
+++ b/resources/lang/fil/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Pahintulutan',
         'authorising' => 'Pinapahintulutan...',
+        'back' => '',
         'back_to_previous' => 'Bumalik sa nakaraang posisyon',
         'back_to_top' => 'Balik sa itaas',
         'cancel' => 'Kansel',
diff --git a/resources/lang/fil/layout.php b/resources/lang/fil/layout.php
index 6c4bc9da1ef..1a9fc200c00 100644
--- a/resources/lang/fil/layout.php
+++ b/resources/lang/fil/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Aking Profile',
             'scoring_mode_toggle' => 'Klasikong pang-iskor',
             'scoring_mode_toggle_tooltip' => 'Iakma ang mga iskor para tumugma sa klasikong pang-iskor',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/fil/multiplayer.php b/resources/lang/fil/multiplayer.php
index bb32ed7eb59..8a7023ed832 100644
--- a/resources/lang/fil/multiplayer.php
+++ b/resources/lang/fil/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Masyadong matagal.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/fil/page_title.php b/resources/lang/fil/page_title.php
index 2aa51914423..5bcaa30d78c 100644
--- a/resources/lang/fil/page_title.php
+++ b/resources/lang/fil/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'mga ranggo',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'tournaments',
         ],
diff --git a/resources/lang/fil/teams.php b/resources/lang/fil/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/fil/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/fr/admin.php b/resources/lang/fr/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/fr/admin.php
+++ b/resources/lang/fr/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/fr/authorization.php b/resources/lang/fr/authorization.php
index 2c4c890ec7e..582a0534fab 100644
--- a/resources/lang/fr/authorization.php
+++ b/resources/lang/fr/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Vous devez soumettre un score sur une beatmap pour ajouter un tag.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Seul le propriétaire de la salle peut la fermer.',
         ],
     ],
 
diff --git a/resources/lang/fr/beatmap_discussions.php b/resources/lang/fr/beatmap_discussions.php
index 36ac50bc912..14e5d10c36d 100644
--- a/resources/lang/fr/beatmap_discussions.php
+++ b/resources/lang/fr/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Vérification des mises à jour...',
+        'has_updates' => 'La discussion a des mises à jour, cliquez pour rafraîchir.',
+        'no_updates' => 'Aucune mise à jour.',
+        'updating' => 'Mise à jour...',
     ],
 
     'reply' => [
diff --git a/resources/lang/fr/beatmaps.php b/resources/lang/fr/beatmaps.php
index 74bfc159867..3dade7ac85a 100644
--- a/resources/lang/fr/beatmaps.php
+++ b/resources/lang/fr/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Impossible de modifier le vote',
diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php
index d7512e61736..c683e2bf463 100644
--- a/resources/lang/fr/common.php
+++ b/resources/lang/fr/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autoriser',
         'authorising' => 'Autorisation en cours...',
+        'back' => '',
         'back_to_previous' => 'Retour à la position précédente',
         'back_to_top' => 'Haut de page',
         'cancel' => 'Annuler',
diff --git a/resources/lang/fr/follows.php b/resources/lang/fr/follows.php
index 6736f851fdb..61f915564ba 100644
--- a/resources/lang/fr/follows.php
+++ b/resources/lang/fr/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Vous avez atteint la limite de joueurs que vous pouvez suivre !',
     ],
 ];
diff --git a/resources/lang/fr/forum.php b/resources/lang/fr/forum.php
index 46a5372dd4c..6e4283c66da 100644
--- a/resources/lang/fr/forum.php
+++ b/resources/lang/fr/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Voulez-vous vraiment restaurer ce sujet ?',
         'deleted' => 'sujet supprimé',
         'go_to_latest' => 'voir le dernier post',
-        'go_to_unread' => '',
+        'go_to_unread' => 'voir le premier message non lu',
         'has_replied' => 'Vous avez répondu à ce sujet',
         'in_forum' => 'dans :forum',
         'latest_post' => ':when par :user',
diff --git a/resources/lang/fr/layout.php b/resources/lang/fr/layout.php
index ee48535fd84..93a8cb45359 100644
--- a/resources/lang/fr/layout.php
+++ b/resources/lang/fr/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mon profil',
             'scoring_mode_toggle' => 'Score classique',
             'scoring_mode_toggle_tooltip' => 'Le score classique utilise un calcul du score qui n\'a pas de limites fixes, similaire à la version stable d\'osu!.',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/fr/multiplayer.php b/resources/lang/fr/multiplayer.php
index 11fb143efbf..0e61364db62 100644
--- a/resources/lang/fr/multiplayer.php
+++ b/resources/lang/fr/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'La durée est trop longue.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/fr/page_title.php b/resources/lang/fr/page_title.php
index 174d3f13ddc..2f86a6dd3f0 100644
--- a/resources/lang/fr/page_title.php
+++ b/resources/lang/fr/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'classements',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'tournois',
         ],
diff --git a/resources/lang/fr/rankings.php b/resources/lang/fr/rankings.php
index 4baf126ead6..b9cac446405 100644
--- a/resources/lang/fr/rankings.php
+++ b/resources/lang/fr/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Difficulté',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Score du Top 10%',
+        'top_50p' => 'Score du Top 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/fr/teams.php b/resources/lang/fr/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/fr/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/he/admin.php b/resources/lang/he/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/he/admin.php
+++ b/resources/lang/he/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/he/beatmaps.php b/resources/lang/he/beatmaps.php
index d78fa5b5e63..5d5c4e7ed44 100644
--- a/resources/lang/he/beatmaps.php
+++ b/resources/lang/he/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'נכשל בעדכון הצבעה',
diff --git a/resources/lang/he/common.php b/resources/lang/he/common.php
index c60bc0b8496..c8125f21274 100644
--- a/resources/lang/he/common.php
+++ b/resources/lang/he/common.php
@@ -22,6 +22,7 @@
         'admin' => 'מנהל',
         'authorise' => 'אשר',
         'authorising' => 'מאשר...',
+        'back' => '',
         'back_to_previous' => 'חזור למיקום הקודם',
         'back_to_top' => 'חזרה למעלה',
         'cancel' => 'בטל',
diff --git a/resources/lang/he/layout.php b/resources/lang/he/layout.php
index 8c587ba0fdf..055147f84a5 100644
--- a/resources/lang/he/layout.php
+++ b/resources/lang/he/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'הפרופיל שלי',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/he/multiplayer.php b/resources/lang/he/multiplayer.php
index dc8c7f1e291..4c473b88477 100644
--- a/resources/lang/he/multiplayer.php
+++ b/resources/lang/he/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/he/page_title.php b/resources/lang/he/page_title.php
index cd464a002c7..1d7c3cfc71e 100644
--- a/resources/lang/he/page_title.php
+++ b/resources/lang/he/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'טורנירים',
         ],
diff --git a/resources/lang/he/teams.php b/resources/lang/he/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/he/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/hr-HR/admin.php b/resources/lang/hr-HR/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/hr-HR/admin.php
+++ b/resources/lang/hr-HR/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/hr-HR/beatmaps.php b/resources/lang/hr-HR/beatmaps.php
index 529afbc786d..105b2ff4563 100644
--- a/resources/lang/hr-HR/beatmaps.php
+++ b/resources/lang/hr-HR/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Ažuriranje glasanja nije uspjelo',
diff --git a/resources/lang/hr-HR/common.php b/resources/lang/hr-HR/common.php
index 4cc6a07c1f6..4f52a013ca9 100644
--- a/resources/lang/hr-HR/common.php
+++ b/resources/lang/hr-HR/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Odobri',
         'authorising' => 'Odobravanje...',
+        'back' => '',
         'back_to_previous' => 'Vrati se na prethodni položaj',
         'back_to_top' => 'Povratak na vrh',
         'cancel' => 'Poništi',
diff --git a/resources/lang/hr-HR/layout.php b/resources/lang/hr-HR/layout.php
index a07200c9061..e625cb3e5db 100644
--- a/resources/lang/hr-HR/layout.php
+++ b/resources/lang/hr-HR/layout.php
@@ -205,6 +205,7 @@
             'profile' => 'Moj profil',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/hr-HR/multiplayer.php b/resources/lang/hr-HR/multiplayer.php
index 12e939d8ff2..6b90ed03746 100644
--- a/resources/lang/hr-HR/multiplayer.php
+++ b/resources/lang/hr-HR/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Trajanje je predugo.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/hr-HR/page_title.php b/resources/lang/hr-HR/page_title.php
index 77252c57cf0..34e432f30dc 100644
--- a/resources/lang/hr-HR/page_title.php
+++ b/resources/lang/hr-HR/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turniri',
         ],
diff --git a/resources/lang/hr-HR/teams.php b/resources/lang/hr-HR/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/hr-HR/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/hu/admin.php b/resources/lang/hu/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/hu/admin.php
+++ b/resources/lang/hu/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/hu/beatmaps.php b/resources/lang/hu/beatmaps.php
index 7accd62416e..e87ddf16aa7 100644
--- a/resources/lang/hu/beatmaps.php
+++ b/resources/lang/hu/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Hiba a szavazat frissítése közben',
diff --git a/resources/lang/hu/common.php b/resources/lang/hu/common.php
index f00830a2bac..64be4f2d22a 100644
--- a/resources/lang/hu/common.php
+++ b/resources/lang/hu/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Engedélyezés',
         'authorising' => 'Engedélyezés...',
+        'back' => '',
         'back_to_previous' => 'Vissza az előző pozícióra',
         'back_to_top' => 'Vissza a lap tetejére',
         'cancel' => 'Mégse',
diff --git a/resources/lang/hu/layout.php b/resources/lang/hu/layout.php
index 01dc0d0a125..971b7ce9560 100644
--- a/resources/lang/hu/layout.php
+++ b/resources/lang/hu/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Profilom',
             'scoring_mode_toggle' => 'Klasszikus pontozás',
             'scoring_mode_toggle_tooltip' => 'Módosítja a pontszámértékeket úgy, hogy közelebb álljon a klasszikus korlátlan pontozáshoz',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/hu/multiplayer.php b/resources/lang/hu/multiplayer.php
index 2460906a851..e35cdf6c353 100644
--- a/resources/lang/hu/multiplayer.php
+++ b/resources/lang/hu/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Az időtartam túl hosszú.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/hu/page_title.php b/resources/lang/hu/page_title.php
index 2716d7c0fe5..125e56093a4 100644
--- a/resources/lang/hu/page_title.php
+++ b/resources/lang/hu/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'rangsorok',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'bajnokságok',
         ],
diff --git a/resources/lang/hu/teams.php b/resources/lang/hu/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/hu/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/id/accounts.php b/resources/lang/id/accounts.php
index e6f3d574125..ef56f660c18 100644
--- a/resources/lang/id/accounts.php
+++ b/resources/lang/id/accounts.php
@@ -28,7 +28,7 @@
         'legacy_api' => [
             'api' => 'api',
             'irc' => 'irc',
-            'title' => 'API lawas',
+            'title' => 'API Lawas',
         ],
 
         'password' => [
@@ -43,7 +43,7 @@
             'title' => 'Profil',
 
             'country_change' => [
-                '_' => "Sepertinya negara yang tertera pada akunmu tidak sesuai dengan negara tempat kamu tinggal. :update_link.",
+                '_' => "Sepertinya negara akunmu tidak sesuai dengan negara tempat kamu tinggal. :update_link.",
                 'update_link' => 'Perbarui ke :country',
             ],
 
diff --git a/resources/lang/id/admin.php b/resources/lang/id/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/id/admin.php
+++ b/resources/lang/id/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/id/authorization.php b/resources/lang/id/authorization.php
index 71e7c03a2b5..be61313770f 100644
--- a/resources/lang/id/authorization.php
+++ b/resources/lang/id/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Kamu harus mencetak skor pada beatmap ini untuk menambahkan tag.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Hanya pemilik ruangan yang dapat menutup ruang permainan.',
         ],
     ],
 
diff --git a/resources/lang/id/beatmap_discussions.php b/resources/lang/id/beatmap_discussions.php
index 758eca8521e..59235d1abd0 100644
--- a/resources/lang/id/beatmap_discussions.php
+++ b/resources/lang/id/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Memeriksa pembaruan...',
+        'has_updates' => 'Halaman diskusi ini memiliki pembaruan. Klik untuk memuat ulang halaman.',
+        'no_updates' => 'Tidak ada pembaruan.',
+        'updating' => 'Memperbarui...',
     ],
 
     'reply' => [
diff --git a/resources/lang/id/beatmaps.php b/resources/lang/id/beatmaps.php
index f9d0a5af5f7..681a40c5b06 100644
--- a/resources/lang/id/beatmaps.php
+++ b/resources/lang/id/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Pilihan gagal diperbarui',
diff --git a/resources/lang/id/common.php b/resources/lang/id/common.php
index 4cfeaecfdf9..2b90e69ab23 100644
--- a/resources/lang/id/common.php
+++ b/resources/lang/id/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Izinkan',
         'authorising' => 'Mengotorisir...',
+        'back' => '',
         'back_to_previous' => 'Kembali ke posisi sebelumnya',
         'back_to_top' => 'Kembali ke atas',
         'cancel' => 'Batal',
diff --git a/resources/lang/id/follows.php b/resources/lang/id/follows.php
index 1f8ed396393..2d8c6a5e8d3 100644
--- a/resources/lang/id/follows.php
+++ b/resources/lang/id/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Batas pengikutan tercapai.',
     ],
 ];
diff --git a/resources/lang/id/forum.php b/resources/lang/id/forum.php
index 985d9e74b05..f0af730c6b0 100644
--- a/resources/lang/id/forum.php
+++ b/resources/lang/id/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Apakah kamu yakin untuk memulihkan topik ini?',
         'deleted' => 'topik yang dihapus',
         'go_to_latest' => 'lihat postingan terbaru',
-        'go_to_unread' => '',
+        'go_to_unread' => 'lihat pos pertama yang belum dibaca',
         'has_replied' => 'Kamu telah mengirimkan balasan pada topik ini',
         'in_forum' => 'pada forum :forum',
         'latest_post' => ':when oleh :user',
@@ -229,7 +229,7 @@
 
             'poll' => [
                 'hide_results' => 'Rahasiakan hasil pada saat pemungutan suara sedang berlangsung.',
-                'hide_results_info' => 'Apabila diaktifkan, hasil suara baru akan tersedia setelah jajak pendapat berakhir.',
+                'hide_results_info' => 'Apabila diaktifkan, hasil ini hanya akan ditampilkan setelah jajak pendapat berakhir.',
                 'length' => 'Jalankan jajak pendapat selama',
                 'length_days_suffix' => 'hari',
                 'length_info' => 'Kosongkan untuk jajak pendapat yang tidak pernah berakhir',
diff --git a/resources/lang/id/layout.php b/resources/lang/id/layout.php
index 36f83a43505..56eb0c36d91 100644
--- a/resources/lang/id/layout.php
+++ b/resources/lang/id/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Profil Saya',
             'scoring_mode_toggle' => 'Perhitungan skor klasik',
             'scoring_mode_toggle_tooltip' => 'Sesuaikan nilai skor untuk lebih menyerupai perhitungan skor klasik yang tidak memiliki batas',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/id/multiplayer.php b/resources/lang/id/multiplayer.php
index cf3bf1948bc..6f1ce097e81 100644
--- a/resources/lang/id/multiplayer.php
+++ b/resources/lang/id/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Durasi pertandingan terlalu lama.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/id/page_title.php b/resources/lang/id/page_title.php
index 058a3e478c6..01cde692b3c 100644
--- a/resources/lang/id/page_title.php
+++ b/resources/lang/id/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'peringkat',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnamen',
         ],
diff --git a/resources/lang/id/rankings.php b/resources/lang/id/rankings.php
index 95c3d7e4863..a03a0d52d18 100644
--- a/resources/lang/id/rankings.php
+++ b/resources/lang/id/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Tingkat Kesulitan',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Skor 10% Teratas',
+        'top_50p' => 'Skor 50% Teratas',
     ],
 
     'filter' => [
diff --git a/resources/lang/id/teams.php b/resources/lang/id/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/id/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/it/admin.php b/resources/lang/it/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/it/admin.php
+++ b/resources/lang/it/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/it/authorization.php b/resources/lang/it/authorization.php
index 5759825bc06..3383c1942a8 100644
--- a/resources/lang/it/authorization.php
+++ b/resources/lang/it/authorization.php
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Solo il proprietario della stanza può chiuderla.',
         ],
     ],
 
diff --git a/resources/lang/it/beatmap_discussions.php b/resources/lang/it/beatmap_discussions.php
index e772ac1a5f5..ad103a9a2a9 100644
--- a/resources/lang/it/beatmap_discussions.php
+++ b/resources/lang/it/beatmap_discussions.php
@@ -70,7 +70,7 @@
         'checking' => '',
         'has_updates' => '',
         'no_updates' => '',
-        'updating' => '',
+        'updating' => 'Aggiornamento...',
     ],
 
     'reply' => [
diff --git a/resources/lang/it/beatmaps.php b/resources/lang/it/beatmaps.php
index d088d9574e3..43d9b1a75eb 100644
--- a/resources/lang/it/beatmaps.php
+++ b/resources/lang/it/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Errore durante l\'aggiornamento del voto',
diff --git a/resources/lang/it/common.php b/resources/lang/it/common.php
index 412bc76af12..5e7fd4b0169 100644
--- a/resources/lang/it/common.php
+++ b/resources/lang/it/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Amministratore',
         'authorise' => 'Autorizza',
         'authorising' => 'Autorizzazione...',
+        'back' => '',
         'back_to_previous' => 'Torna alla posizione precedente',
         'back_to_top' => 'Torna in cima',
         'cancel' => 'Cancella',
diff --git a/resources/lang/it/follows.php b/resources/lang/it/follows.php
index de097af1718..711a5f27f75 100644
--- a/resources/lang/it/follows.php
+++ b/resources/lang/it/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Limite raggiunto di follow.',
     ],
 ];
diff --git a/resources/lang/it/forum.php b/resources/lang/it/forum.php
index 9107234eab7..26e433a7d6e 100644
--- a/resources/lang/it/forum.php
+++ b/resources/lang/it/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Vuoi veramente ripristinare il topic?',
         'deleted' => 'discussione eliminata',
         'go_to_latest' => 'guarda l\'ultimo post',
-        'go_to_unread' => '',
+        'go_to_unread' => 'vedi ultimo post non letto',
         'has_replied' => 'Hai risposto a questo topic',
         'in_forum' => 'in :forum',
         'latest_post' => ':when da :user',
diff --git a/resources/lang/it/layout.php b/resources/lang/it/layout.php
index 65f5032655d..8a9f6deff20 100644
--- a/resources/lang/it/layout.php
+++ b/resources/lang/it/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Profilo',
             'scoring_mode_toggle' => 'Punteggio classico',
             'scoring_mode_toggle_tooltip' => 'Regola i valori del punteggio per farli sembrare come il punteggio classico illimitato',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/it/multiplayer.php b/resources/lang/it/multiplayer.php
index e6af08a4e31..249463946ca 100644
--- a/resources/lang/it/multiplayer.php
+++ b/resources/lang/it/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'La durata è troppo lunga.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/it/page_title.php b/resources/lang/it/page_title.php
index a9aad10aa32..6a74294eb06 100644
--- a/resources/lang/it/page_title.php
+++ b/resources/lang/it/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'classifiche',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'tornei',
         ],
diff --git a/resources/lang/it/teams.php b/resources/lang/it/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/it/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/ja/admin.php b/resources/lang/ja/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ja/admin.php
+++ b/resources/lang/ja/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ja/beatmaps.php b/resources/lang/ja/beatmaps.php
index 0c30f11a6a3..06d26289c68 100644
--- a/resources/lang/ja/beatmaps.php
+++ b/resources/lang/ja/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '評価の更新に失敗しました',
diff --git a/resources/lang/ja/common.php b/resources/lang/ja/common.php
index e9e333370a7..5b61e7dabb4 100644
--- a/resources/lang/ja/common.php
+++ b/resources/lang/ja/common.php
@@ -22,6 +22,7 @@
         'admin' => '管理者',
         'authorise' => '承認',
         'authorising' => '承認中...',
+        'back' => '',
         'back_to_previous' => '直前の状態に戻す',
         'back_to_top' => 'トップに戻る',
         'cancel' => 'キャンセル',
diff --git a/resources/lang/ja/layout.php b/resources/lang/ja/layout.php
index 26abdf16788..07580bc428f 100644
--- a/resources/lang/ja/layout.php
+++ b/resources/lang/ja/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'プロフィール',
             'scoring_mode_toggle' => 'クラシックスコアリング',
             'scoring_mode_toggle_tooltip' => 'スコア値を調整し、クラシックな無制限スコアリングに近い感覚に変える',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ja/multiplayer.php b/resources/lang/ja/multiplayer.php
index f1f6b8b2f67..57a405b6737 100644
--- a/resources/lang/ja/multiplayer.php
+++ b/resources/lang/ja/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '時間が長すぎます。',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ja/page_title.php b/resources/lang/ja/page_title.php
index aaa3c819a08..3e1b36cd760 100644
--- a/resources/lang/ja/page_title.php
+++ b/resources/lang/ja/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'ランキング',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'トーナメント',
         ],
diff --git a/resources/lang/ja/teams.php b/resources/lang/ja/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ja/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/kk-KZ/admin.php b/resources/lang/kk-KZ/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/kk-KZ/admin.php
+++ b/resources/lang/kk-KZ/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/kk-KZ/beatmaps.php b/resources/lang/kk-KZ/beatmaps.php
index 7aec510dc25..1279354e222 100644
--- a/resources/lang/kk-KZ/beatmaps.php
+++ b/resources/lang/kk-KZ/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Дауысты жаңарту іске аспады',
diff --git a/resources/lang/kk-KZ/common.php b/resources/lang/kk-KZ/common.php
index 521783b4ac9..d61ce67e79a 100644
--- a/resources/lang/kk-KZ/common.php
+++ b/resources/lang/kk-KZ/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Администратор',
         'authorise' => 'Тіркелу',
         'authorising' => 'Тіркелуде...',
+        'back' => '',
         'back_to_previous' => '',
         'back_to_top' => 'Басына қайту ',
         'cancel' => 'Болдырмау',
diff --git a/resources/lang/kk-KZ/layout.php b/resources/lang/kk-KZ/layout.php
index b0202a55d35..df3b72b3dec 100644
--- a/resources/lang/kk-KZ/layout.php
+++ b/resources/lang/kk-KZ/layout.php
@@ -201,6 +201,7 @@
             'profile' => '',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/kk-KZ/multiplayer.php b/resources/lang/kk-KZ/multiplayer.php
index 21a4c49f80b..b82da0a79c6 100644
--- a/resources/lang/kk-KZ/multiplayer.php
+++ b/resources/lang/kk-KZ/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/kk-KZ/page_title.php b/resources/lang/kk-KZ/page_title.php
index 31e3bff98e8..9b4be4fee6c 100644
--- a/resources/lang/kk-KZ/page_title.php
+++ b/resources/lang/kk-KZ/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'жарыстар',
         ],
diff --git a/resources/lang/kk-KZ/teams.php b/resources/lang/kk-KZ/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/kk-KZ/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/ko/admin.php b/resources/lang/ko/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ko/admin.php
+++ b/resources/lang/ko/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ko/authorization.php b/resources/lang/ko/authorization.php
index 5c5d8f6b58e..6b8f4268a8d 100644
--- a/resources/lang/ko/authorization.php
+++ b/resources/lang/ko/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => '비트맵에 태그를 추가하려면 점수를 지정해야 합니다.',
         ],
     ],
 
@@ -71,7 +71,7 @@
         'friends_only' => '해당 유저는 친구가 아닌 유저의 메시지를 차단한 상태입니다.',
         'moderated' => '채널은 현재 관리 중입니다.',
         'no_access' => '해당 채널에 대한 접근 권한이 없습니다.',
-        'no_announce' => '',
+        'no_announce' => '공지를 게시할 권한이 없습니다.',
         'receive_friends_only' => '친구 목록에 있는 사람들의 메시지만 수락하기 때문에 유저가 답장하지 못할 수 있습니다.',
         'restricted' => '침묵, 제한, 차단 상태에서는 메시지를 전송할 수 없습니다.',
         'silenced' => '침묵, 제한, 차단 상태에서는 메시지를 전송할 수 없습니다.',
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => '방 소유자만 닫을 수 있습니다.',
         ],
     ],
 
diff --git a/resources/lang/ko/beatmap_discussions.php b/resources/lang/ko/beatmap_discussions.php
index fdba87ee2e7..8d336678a15 100644
--- a/resources/lang/ko/beatmap_discussions.php
+++ b/resources/lang/ko/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => '업데이트 확인 중...',
+        'has_updates' => '토론에 새 업데이트가 있습니다, 클릭하여 새로 고치세요.',
+        'no_updates' => '업데이트가 없습니다.',
+        'updating' => '업데이트 중...',
     ],
 
     'reply' => [
diff --git a/resources/lang/ko/beatmaps.php b/resources/lang/ko/beatmaps.php
index 5598f4b8897..efa5562c36b 100644
--- a/resources/lang/ko/beatmaps.php
+++ b/resources/lang/ko/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '투표 변경 실패',
diff --git a/resources/lang/ko/common.php b/resources/lang/ko/common.php
index 677fcfed250..c8d6e16ac09 100644
--- a/resources/lang/ko/common.php
+++ b/resources/lang/ko/common.php
@@ -22,6 +22,7 @@
         'admin' => '관리',
         'authorise' => '권한 부여',
         'authorising' => '인증하기...',
+        'back' => '',
         'back_to_previous' => '이전 위치로 돌아가기',
         'back_to_top' => '맨 위로',
         'cancel' => '취소',
diff --git a/resources/lang/ko/community.php b/resources/lang/ko/community.php
index a15ceb99256..f8c4a4477db 100644
--- a/resources/lang/ko/community.php
+++ b/resources/lang/ko/community.php
@@ -20,7 +20,7 @@
             ],
             'infra' => [
                 'title' => '서버 인프라',
-                'description' => '여러분의 기부금은 웹사이트, 멀티플레이 서비스, 온라인 순위 등의 서버를 운영하는 곳에 사용됩니다.',
+                'description' => '여러분의 기부금은 웹사이트, 멀티플레이 서비스, 온라인 리더보드 등의 서버를 운영하는 데에 사용됩니다.',
             ],
             'featured-artists' => [
                 'title' => '공식 아티스트',
@@ -51,7 +51,7 @@
 
             'friend_ranking' => [
                 'title' => '친구 순위',
-                'description' => "게임 안과 웹사이트의 비트맵 리더보드에서 친구보다 얼마나 한수 위인지 볼 수 있습니다.",
+                'description' => "게임 내와 웹사이트의 비트맵 리더보드로 친구들과의 실력을 비교해보세요.",
             ],
 
             'country_ranking' => [
diff --git a/resources/lang/ko/follows.php b/resources/lang/ko/follows.php
index 406740cf78c..0c3cd3d25e2 100644
--- a/resources/lang/ko/follows.php
+++ b/resources/lang/ko/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => '등록 가능한 최대 팔로우 수에 도달했습니다.',
     ],
 ];
diff --git a/resources/lang/ko/forum.php b/resources/lang/ko/forum.php
index 1f27979e8a7..769bd6566c8 100644
--- a/resources/lang/ko/forum.php
+++ b/resources/lang/ko/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => '정말 이 주제를 복원할까요?',
         'deleted' => '삭제된 주제',
         'go_to_latest' => '최근에 올라온 글 보기',
-        'go_to_unread' => '',
+        'go_to_unread' => '읽지 않은 첫번째 게시글 보기',
         'has_replied' => '이 주제에 답글을 달았습니다.',
         'in_forum' => ':forum에서',
         'latest_post' => ':when by :user',
diff --git a/resources/lang/ko/layout.php b/resources/lang/ko/layout.php
index 974a175c6a4..2e895aba10b 100644
--- a/resources/lang/ko/layout.php
+++ b/resources/lang/ko/layout.php
@@ -201,6 +201,7 @@
             'profile' => '내 프로필',
             'scoring_mode_toggle' => '클래식 점수',
             'scoring_mode_toggle_tooltip' => '점숫값을 한계치가 없는 예전 클래식 점수처럼 느껴지도록 조정합니다.',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ko/multiplayer.php b/resources/lang/ko/multiplayer.php
index 50bde6f8868..29600b44e80 100644
--- a/resources/lang/ko/multiplayer.php
+++ b/resources/lang/ko/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '기간이 너무 깁니다.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ko/page_title.php b/resources/lang/ko/page_title.php
index 3ee67e17787..3277cbceaa7 100644
--- a/resources/lang/ko/page_title.php
+++ b/resources/lang/ko/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '순위',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '토너먼트',
         ],
diff --git a/resources/lang/ko/rankings.php b/resources/lang/ko/rankings.php
index e61745ac56a..a61e0aab4d4 100644
--- a/resources/lang/ko/rankings.php
+++ b/resources/lang/ko/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => '난이도',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => '상위 10% 점수',
+        'top_50p' => '상위 50% 점수',
     ],
 
     'filter' => [
diff --git a/resources/lang/ko/teams.php b/resources/lang/ko/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ko/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/lt/admin.php b/resources/lang/lt/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/lt/admin.php
+++ b/resources/lang/lt/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/lt/beatmaps.php b/resources/lang/lt/beatmaps.php
index 55b863bfa0f..32fe1c29530 100644
--- a/resources/lang/lt/beatmaps.php
+++ b/resources/lang/lt/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Balsavimo nepavyko atnaujinti',
diff --git a/resources/lang/lt/common.php b/resources/lang/lt/common.php
index debf901e3b7..f0c4c118c1d 100644
--- a/resources/lang/lt/common.php
+++ b/resources/lang/lt/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administratorius',
         'authorise' => 'Leisti',
         'authorising' => 'Leidžiama...',
+        'back' => '',
         'back_to_previous' => 'Grįžti į ankstesnę poziciją',
         'back_to_top' => 'Grįžti į viršų',
         'cancel' => 'Atšaukti',
diff --git a/resources/lang/lt/layout.php b/resources/lang/lt/layout.php
index 98df76fda12..f4298eec1c5 100644
--- a/resources/lang/lt/layout.php
+++ b/resources/lang/lt/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mano Profilis',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/lt/multiplayer.php b/resources/lang/lt/multiplayer.php
index 2e406c8421e..50905c64e2e 100644
--- a/resources/lang/lt/multiplayer.php
+++ b/resources/lang/lt/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Per ilga trūkmė.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/lt/page_title.php b/resources/lang/lt/page_title.php
index 482d9f45658..304476a6664 100644
--- a/resources/lang/lt/page_title.php
+++ b/resources/lang/lt/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'reitingai',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnyrai',
         ],
diff --git a/resources/lang/lt/teams.php b/resources/lang/lt/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/lt/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/lv-LV/accounts.php b/resources/lang/lv-LV/accounts.php
index 3b1f11b824e..3a6977652b5 100644
--- a/resources/lang/lv-LV/accounts.php
+++ b/resources/lang/lv-LV/accounts.php
@@ -10,7 +10,7 @@
 
         'avatar' => [
             'title' => 'Avatārs',
-            'reset' => '',
+            'reset' => 'atiestatīt',
             'rules' => 'Lūdzu, pārliecinieties, ka jūsu profila attēls atbilst :link.<br/>Tas nozīmē, ka attēlam jābūt <strong>piemērotam visiem vecumiem</strong>, t.i., bez kailuma, rupjībām vai ierosinoša satura.',
             'rules_link' => 'kopienas noteikumi',
         ],
@@ -77,8 +77,8 @@
     ],
 
     'notifications' => [
-        'beatmapset_discussion_qualified_problem' => 'saņemt paziņojumus par jaunām problēmām, kas saistītas ar kvalificētām šādu režīmu sitkartēm',
-        'beatmapset_disqualify' => 'saņemt paziņojumus, kad tiek diskvalificētas šādu režīmu sitkartes',
+        'beatmapset_discussion_qualified_problem' => 'saņemt paziņojumus par jaunām problēmām, kas saistītas ar kvalificētām šādu spēles veida ritma-kartēm',
+        'beatmapset_disqualify' => 'saņemt paziņojumus, kad tiek diskvalificētas šāda spēles veida  ritma-kartes',
         'comment_reply' => 'saņemt paziņojumus par atbildēm uz saviem komentāriem',
         'title' => 'Paziņojumi',
         'topic_auto_subscribe' => 'automātiski ieslēgt paziņojumus foruma tematiem, kurus esiet izveidojis',
@@ -86,13 +86,13 @@
         'options' => [
             '_' => 'piegādes opcijas',
             'beatmap_owner_change' => 'viesa grūtības līmenis',
-            'beatmapset:modding' => 'bītmapju modifikācijas',
+            'beatmapset:modding' => 'ritma-karšu modifikācijas',
             'channel_message' => 'privātās čata ziņas',
             'comment_new' => 'jauni komentāri',
             'forum_topic_reply' => 'tēmas atbilde',
             'mail' => 'pasts',
-            'mapping' => 'bītmapes kartētājs',
-            'push' => 'push',
+            'mapping' => 'ritma-kartes izveidotājs',
+            'push' => 'piespiestu',
         ],
     ],
 
@@ -103,12 +103,12 @@
     ],
 
     'options' => [
-        'beatmapset_show_nsfw' => 'slēpt brīdinājumus par nepiemērotu saturu bītmapēs',
-        'beatmapset_title_show_original' => 'rādīt bītmapes metadatus oriģinālvalodā',
+        'beatmapset_show_nsfw' => 'slēpt brīdinājumus par nepiemērotu saturu ritma-mapēs',
+        'beatmapset_title_show_original' => 'rādīt ritma-mapes metadatus oriģinālvalodā',
         'title' => 'Opcijas',
 
         'beatmapset_download' => [
-            '_' => 'noklusējuma bītmapes lejupielādes tips',
+            '_' => 'noklusējuma ritma-mapes lejupielādes tips',
             'all' => 'ar video, ja pieejams',
             'direct' => 'atvērt osu!direct',
             'no_video' => 'bez video',
diff --git a/resources/lang/lv-LV/admin.php b/resources/lang/lv-LV/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/lv-LV/admin.php
+++ b/resources/lang/lv-LV/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/lv-LV/api.php b/resources/lang/lv-LV/api.php
index a48cd29e0b3..2e68dba664e 100644
--- a/resources/lang/lv-LV/api.php
+++ b/resources/lang/lv-LV/api.php
@@ -7,29 +7,29 @@
     'error' => [
         'chat' => [
             'empty' => 'Nevar nosūtīt tukšu ziņu.',
-            'limit_exceeded' => 'Jūs pārāk ātri sūtāt ziņas, lūdzu, nedaudz uzgaidiet, pirms mēģināt vēlreiz.',
-            'too_long' => 'Ziņa, ko mēģināt nosūtīt, ir pārāk gara.',
+            'limit_exceeded' => 'Tu pārāk ātri sūtāt ziņas, lūdzu, nedaudz uzgaidiet, pirms mēģiniet vēlreiz.',
+            'too_long' => 'Ziņa, ko mēģināji nosūtīt, ir pārāk gara.',
         ],
     ],
 
     'scopes' => [
-        'bot' => 'Darboties kā čata bots.',
+        'bot' => 'Darboties kā sarakstu robots.',
         'identify' => 'Identificēt sevi un lasīt savu publisko profilu.',
 
         'chat' => [
-            'read' => 'Lasīt ziņas jūsu vārdā.',
-            'write' => 'Sūtīt ziņas jūsu vārdā.',
-            'write_manage' => 'Pievienoties un pamest kanālus jūsu vietā.',
+            'read' => 'Lasīt ziņas tavā vārdā.',
+            'write' => 'Sūtīt ziņas tavā vārdā.',
+            'write_manage' => 'Pievienoties un pamest kanālus tavā vietā.',
         ],
 
         'forum' => [
-            'write' => 'Jūsu vārdā izveidot un rediģēt foruma tēmas un ziņojumus.',
+            'write' => 'Tavā vārdā izveidot un rediģēt foruma tēmas un ziņojumus.',
         ],
 
         'friends' => [
-            'read' => 'Skatīt, kam jūs sekojat.',
+            'read' => 'Skatīt, kam tu seko.',
         ],
 
-        'public' => 'Lasīt publiskos datus jūsu vārdā.',
+        'public' => 'Lasīt publiskos datus tavā vārdā.',
     ],
 ];
diff --git a/resources/lang/lv-LV/artist.php b/resources/lang/lv-LV/artist.php
index c1f4ab5c1c3..29e58b52cd1 100644
--- a/resources/lang/lv-LV/artist.php
+++ b/resources/lang/lv-LV/artist.php
@@ -4,25 +4,25 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'page_description' => 'osu! Attēlotie mākslinieki',
-    'title' => 'Attēlotie Mākslinieki',
+    'page_description' => 'osu! Izvēlētie mākslinieki',
+    'title' => 'Izvēlētie Mākslinieki',
 
     'admin' => [
         'hidden' => 'PAŠLAIK MĀKSLINIEKS IR PASLĒPTS',
     ],
 
     'beatmaps' => [
-        '_' => 'Bītmapes',
+        '_' => 'Ritma-mapes',
         'download' => 'Lejupielādēt Bītmapes Veidni',
         'download-na' => 'Bītmapes Veidne vēl nav pieejama',
     ],
 
     'index' => [
-        'description' => 'Attēlotie mākslinieki ir mākslinieki, ar kuriem mēs sadarbojamies, lai osu! piedāvātu jaunu un oriģinālu mūziku. Šos māksliniekus un viņu dziesmu izlasi ir atlasījusi osu! komanda, jo tās ir lieliskas un piemērotas bītmapju veidošanai. Daži no šiem māksliniekiem ir radījuši arī ekskluzīvas jaunas dziesmas izmantošanai osu!.<br><br>Visas šajā sadaļā iekļautās dziesmas ir nodrošinātas kā pirmatnēji .osz faili un ir oficiāli licencētas izmantošanai osu! un ar osu! saistītā saturā.',
+        'description' => 'Izvēlētie mākslinieki ir mākslinieki, ar kuriem mēs sadarbojamies, lai osu! piedāvātu jaunu un oriģinālu mūziku. Šos māksliniekus un viņu dziesmu izlasi ir atlasījusi osu! komanda, jo tās ir lieliskas un piemērotas ritma-mapju veidošanai. Daži no šiem Izvēlētajiem Māksliniekiem ir radījuši arī ekskluzīvas jaunas dziesmas izmantošanai osu!.<br><br>Visas šajā sadaļā iekļautās dziesmas ir nodrošinātas kā pirmatnēji .osz faili un ir oficiāli licencētas izmantošanai osu! un ar osu! saistītā saturā.',
     ],
 
     'links' => [
-        'beatmaps' => 'osu! Bītmapes',
+        'beatmaps' => 'osu! Ritma-Mapes',
         'osu' => 'osu! profils',
         'site' => 'Oficiālā tīmekļa vietne',
     ],
@@ -46,8 +46,8 @@
             '_' => 'dziesmu meklēšana',
 
             'exclusive_only' => [
-                'all' => '',
-                'exclusive_only' => '',
+                'all' => ' Viss',
+                'exclusive_only' => 'osu! oriģināls',
             ],
 
             'form' => [
@@ -57,7 +57,7 @@
                 'bpm_gte' => 'BPM Minimums',
                 'bpm_lte' => 'BPM Maksimums',
                 'empty' => 'Netika atrasta neviena dziesma, kas atbilstu meklēšanas kritērijiem.',
-                'exclusive_only' => '',
+                'exclusive_only' => 'Tips',
                 'genre' => 'Žanrs',
                 'genre_all' => 'Viss',
                 'length_gte' => 'Minimālais Garums',
diff --git a/resources/lang/lv-LV/authorization.php b/resources/lang/lv-LV/authorization.php
index 93df01dac55..1ffea2f5b59 100644
--- a/resources/lang/lv-LV/authorization.php
+++ b/resources/lang/lv-LV/authorization.php
@@ -4,10 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'play_more' => 'Kā būtu, ja tā vietā nedaudz paspēlētu osu!?',
+    'play_more' => 'Kā būtu, ja tā vietā nedaudz paspēlētu osu?',
     'require_login' => 'Lūdzu, pierakstieties, lai turpinātu.',
     'require_verification' => 'Lūdzu, verificēt, lai turpinātu.',
-    'restricted' => "Nevar veikt darbību, kamēr esat ierobežots.",
+    'restricted' => "Nevar veikt darbību, kamēr esi ierobežots.",
     'silenced' => "Nevar veikt darbību, kamēr esat apklusināts.",
     'unauthorized' => 'Piekļuve liegta.',
 
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Tev vajag uzstādīt rezultātu uz ritma-mapi lai pievienotu atzīmi.',
         ],
     ],
 
@@ -71,7 +71,7 @@
         'friends_only' => 'Lietotājs bloķē ziņas no cilvēkiem, kas nav viņa draugu sarakstā.',
         'moderated' => 'Šis kanāls pašlaik tiek moderēts.',
         'no_access' => 'Jums nav piekļuves tiesības uz šo kanālu.',
-        'no_announce' => '',
+        'no_announce' => 'Tev nav atļauja publicēt paziņojumu.',
         'receive_friends_only' => 'Lietotājs nevarēs atbildēt, jo jūs pieņemat ziņas tikai no cilvēkiem, kas ir jūsu draugu sarakstā.',
         'restricted' => 'Jūs nevarat sūtīt ziņas, kamēr esat klusināts, ierobežots vai bloķēts.',
         'silenced' => 'Jūs nevarat sūtīt ziņas, kamēr esat klusināts, ierobežots vai bloķēts.',
@@ -87,7 +87,7 @@
     ],
 
     'contest' => [
-        'judging_not_active' => '',
+        'judging_not_active' => 'Tiesāšana šīm sacensībām nav aktīva.',
         'voting_over' => 'Jūs nevarat mainīt savu balsojumu pēc šī konkursa balsošanas perioda beigām.',
 
         'entry' => [
@@ -178,14 +178,14 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Tikai istabas īpašnieks var to aizvērt.',
         ],
     ],
 
     'score' => [
         'pin' => [
             'disabled_type' => "Nevar piespraust šāda veida rezultātu",
-            'failed' => "",
+            'failed' => "Nevar piespraust izgāzušos rezultātu.",
             'not_owner' => 'Rezultātu var piespraust tikai rezultāta īpašnieks.',
             'too_many' => 'Piesprausti pārāk daudz rezultāti.',
         ],
diff --git a/resources/lang/lv-LV/beatmap_discussions.php b/resources/lang/lv-LV/beatmap_discussions.php
index 7a1b113a020..0bf1d670431 100644
--- a/resources/lang/lv-LV/beatmap_discussions.php
+++ b/resources/lang/lv-LV/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Pārbauda atjauninājumus...',
+        'has_updates' => 'Šai diskusijai ir atjauninājumi, uzspiest lai atsvaidzinātu.',
+        'no_updates' => 'Nav atjauninājumu.',
+        'updating' => 'Atjauninās...',
     ],
 
     'reply' => [
diff --git a/resources/lang/lv-LV/beatmaps.php b/resources/lang/lv-LV/beatmaps.php
index 5683ffa3471..781797edaea 100644
--- a/resources/lang/lv-LV/beatmaps.php
+++ b/resources/lang/lv-LV/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Neizdevās atjaunināt balsojumu',
@@ -25,14 +29,14 @@
         'message_placeholder_silenced' => "Nevar publicēt diskusiju, kamēr apklusināts.",
         'message_type_select' => 'Atlasiet Komentāra Tipu',
         'reply_notice' => 'Nospiediet enter, lai atbildētu.',
-        'reply_resolve_notice' => '',
+        'reply_resolve_notice' => 'Uzspied enter lai atbildētu. Uzspeid ctrl+enter lai atbildētu un atrisinātu.',
         'reply_placeholder' => 'Raksiet atbildi šeit',
         'require-login' => 'Lūdzu, pierakstieties, lai publicētu vai atbildētu',
         'resolved' => 'Atrisināts',
         'restore' => 'atjaunot',
         'show_deleted' => 'Rādīt dzēstos',
         'title' => 'Diskusijas',
-        'unresolved_count' => '',
+        'unresolved_count' => ':count_delimited neatrisināta problēma|:count_delimited neatrisinātas problēmas',
 
         'collapse' => [
             'all-collapse' => 'Sakļaut visu',
@@ -84,7 +88,7 @@
             'disqualify' => 'Publicēt diskvalifikāciju',
             'hype' => '',
             'mapper_note' => 'Publicēt piezīmi',
-            'nomination_reset' => '',
+            'nomination_reset' => 'Noņemt visas nominācijas',
             'praise' => 'Publicēt slavējumu',
             'problem' => 'Publicēt problēmu',
             'problem_warning' => 'Publicēt problēmu',
@@ -215,8 +219,8 @@
 
         'rank_estimate' => [
             '_' => 'Tiek paredzēts, ka šī mape tiks ierindota :date, ja netiks konstatētas problēmas. Tā ir #:position :queue.',
-            'unresolved_problems' => '',
-            'problems' => '',
+            'unresolved_problems' => 'Šī ritma-mape pašlaik ir nobloķēta no iziešanas no Kvalificēta statusa, līdz :problems tiks atrisināts.',
+            'problems' => 'šīs problēmas',
             'on' => ':date',
             'queue' => 'ierindošanas rinda',
             'soon' => 'drīz',
@@ -285,7 +289,7 @@
         'taiko' => '',
         'fruits' => '',
         'mania' => '',
-        'undefined' => '',
+        'undefined' => 'nav uzstādīts',
     ],
     'status' => [
         'any' => 'Viss',
diff --git a/resources/lang/lv-LV/beatmapsets.php b/resources/lang/lv-LV/beatmapsets.php
index bd712d58872..e3b3de05fe1 100644
--- a/resources/lang/lv-LV/beatmapsets.php
+++ b/resources/lang/lv-LV/beatmapsets.php
@@ -17,7 +17,7 @@
 
     'download' => [
         'limit_exceeded' => 'Piebremzējiet, spēlējiet vairāk.',
-        'no_mirrors' => '',
+        'no_mirrors' => 'Nav pieejami lejupielādes serveri.',
     ],
 
     'featured_artist_badge' => [
@@ -68,7 +68,7 @@
         'discussion' => 'Diskusija',
 
         'admin' => [
-            'full_size_cover' => '',
+            'full_size_cover' => 'Skatīt pilna izmēra bildes pārvalku',
         ],
 
         'deleted_banner' => [
diff --git a/resources/lang/lv-LV/common.php b/resources/lang/lv-LV/common.php
index 49d491fb2b3..19092c9eb4a 100644
--- a/resources/lang/lv-LV/common.php
+++ b/resources/lang/lv-LV/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autorizēt',
         'authorising' => 'Autorizē...',
+        'back' => '',
         'back_to_previous' => 'Atgriezties iepriekšējā pozīcijā',
         'back_to_top' => 'Atpakaļ uz augšu',
         'cancel' => 'Atcelt',
@@ -39,7 +40,7 @@
         'pin' => 'piespraust',
         'post' => 'Publicēt',
         'read_more' => 'lasīt vairāk',
-        'refresh' => '',
+        'refresh' => 'Atsvaidzināt',
         'reply' => 'Atbildēt',
         'reply_reopen' => 'Atbildēt un Atvērt atkārtoti',
         'reply_resolve' => 'Atbildēt un atrisināt',
diff --git a/resources/lang/lv-LV/contest.php b/resources/lang/lv-LV/contest.php
index f6bb087bcda..53224f684e9 100644
--- a/resources/lang/lv-LV/contest.php
+++ b/resources/lang/lv-LV/contest.php
@@ -14,7 +14,7 @@
     ],
 
     'judge' => [
-        'comments' => '',
+        'comments' => 'komentāri',
         'hide_judged' => 'paslēpt vērtētos ierakstus',
         'nav_title' => 'tiesāt',
         'no_current_vote' => 'tu vēl nebalsoji.',
diff --git a/resources/lang/lv-LV/errors.php b/resources/lang/lv-LV/errors.php
index 78b760b6446..4dfa96dd31c 100644
--- a/resources/lang/lv-LV/errors.php
+++ b/resources/lang/lv-LV/errors.php
@@ -29,7 +29,7 @@
         'generic' => 'Jūsu pirkuma pārbaudes sagatavošanas laikā notikusi kļūda.',
     ],
     'scores' => [
-        'invalid_id' => '',
+        'invalid_id' => 'Nepareizs rezultāta id.',
     ],
     'search' => [
         'default' => 'Nezidevās iegūt rezultātus, mēģiniet vēlreiz vēlāk.',
@@ -37,6 +37,6 @@
         'operation_timeout_exception' => 'Meklēšana pašlaik ir aizņemtāka nekā parasti, mēģiniet vēlreiz vēlāk.',
     ],
     'user_report' => [
-        'recently_reported' => "",
+        'recently_reported' => "Tu jau esi par šo ziņojis nesen.",
     ],
 ];
diff --git a/resources/lang/lv-LV/follows.php b/resources/lang/lv-LV/follows.php
index 15c25072eff..9f683ce48d8 100644
--- a/resources/lang/lv-LV/follows.php
+++ b/resources/lang/lv-LV/follows.php
@@ -24,19 +24,19 @@
     ],
 
     'mapping' => [
-        'empty' => 'Nav vērotu kartētāju.',
-        'followers' => 'kartētāju abonenti',
-        'page_title' => 'kartētāju vērošanas saraksts',
-        'title' => 'kartētājs',
-        'to_0' => 'pārtraukt paziņot man, kad šis lietotājs augšupielādē jaunu bītmapi',
-        'to_1' => 'paziņot man, kad šis lietotājs augšupielādē jaunu bītmapi',
+        'empty' => 'Nav vērotu ritma-mapju izveidotāju.',
+        'followers' => 'ritma-mapju izveidotāju abonenti',
+        'page_title' => 'ritma-mapju veidotāju vērošanas saraksts',
+        'title' => 'ritma-mapju veidotājs',
+        'to_0' => 'pārtraukt paziņot man, kad šis lietotājs augšupielādē jaunu ritma-mapi',
+        'to_1' => 'paziņot man, kad šis lietotājs augšupielādē jaunu rima-mapi',
     ],
 
     'modding' => [
-        'title' => 'bītmapes diskusija',
+        'title' => 'ritma-mapes diskusija',
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Sekošanas limits ir sasniegts.',
     ],
 ];
diff --git a/resources/lang/lv-LV/forum.php b/resources/lang/lv-LV/forum.php
index 3519fe5a60d..9b5d03c63c0 100644
--- a/resources/lang/lv-LV/forum.php
+++ b/resources/lang/lv-LV/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Vai tiešām atjaunot tēmu?',
         'deleted' => 'izdzēstā tēma',
         'go_to_latest' => 'skatīt beidzamo rakstu',
-        'go_to_unread' => '',
+        'go_to_unread' => 'skatīt pirmo neizlasīto rakstu',
         'has_replied' => 'Jūs atbildējāt uz šo tēmu',
         'in_forum' => 'iekš :forum',
         'latest_post' => ':when no :user',
@@ -161,20 +161,20 @@
                 'fork' => 'Nokopēta tēma',
                 'issue_tag' => 'Izsniegts tags',
                 'lock' => 'Slēgta tēma',
-                'merge' => '',
+                'merge' => 'Apvienot rakstus šajā tematā',
                 'move' => 'Pārvietoja tematu',
                 'pin' => 'Piesprauda tematu',
                 'post_edited' => 'Rediģēja rakstu',
                 'restore_post' => 'Atjaunoja rakstu',
                 'restore_topic' => 'Atjaunoja tematu',
-                'split_destination' => '',
+                'split_destination' => 'Pārvietot sadalītos rakstus',
                 'split_source' => 'Sadalīt rakstus',
-                'topic_type' => '',
-                'topic_type_changed' => '',
-                'unlock' => '',
-                'unpin' => '',
-                'user_lock' => '',
-                'user_unlock' => '',
+                'topic_type' => 'Uzstādi temata tipu',
+                'topic_type_changed' => 'Izmaini temata tipu',
+                'unlock' => 'Neaizslēgts temats',
+                'unpin' => 'Nepiesprausts temats',
+                'user_lock' => 'Aizslēdzi savu tematu',
+                'user_unlock' => 'Atvēri savu tematu',
             ],
         ],
 
@@ -186,60 +186,60 @@
 
     'topic_watches' => [
         'index' => [
-            'title_compact' => '',
+            'title_compact' => 'foruma tematu ',
 
             'box' => [
-                'total' => '',
-                'unread' => '',
+                'total' => 'Abonētie temati',
+                'unread' => 'Temati ar jaunām atbildēm',
             ],
 
             'info' => [
-                'total' => '',
-                'unread' => '',
+                'total' => 'Tu esi abonējis :total tematus.',
+                'unread' => 'Tev ir :unread neizlasītas atbildes abonētajos tematos.',
             ],
         ],
 
         'topic_buttons' => [
             'remove' => [
-                'confirmation' => '',
-                'title' => '',
+                'confirmation' => 'Izbeigt abonementu šim tematam?',
+                'title' => 'Izbeigt abonementu.',
             ],
         ],
     ],
 
     'topics' => [
-        '_' => '',
+        '_' => 'Temati',
 
         'actions' => [
-            'login_reply' => '',
-            'reply' => '',
-            'reply_with_quote' => '',
-            'search' => '',
+            'login_reply' => 'Pierakstīties lai atbildētu',
+            'reply' => 'Atbildēt',
+            'reply_with_quote' => 'Citēt rakstu priekš atbildes',
+            'search' => 'Meklēt',
         ],
 
         'create' => [
-            'create_poll' => '',
+            'create_poll' => 'Aptaujas Izveide',
 
-            'preview' => '',
+            'preview' => 'Raksta Priekšskatījums',
 
             'create_poll_button' => [
-                'add' => '',
-                'remove' => '',
+                'add' => 'Izveidot aptauju',
+                'remove' => 'Atcelt aptaujas izveidi',
             ],
 
             'poll' => [
-                'hide_results' => '',
-                'hide_results_info' => '',
+                'hide_results' => 'Paslēpt aptaujas rezultātus.',
+                'hide_results_info' => 'Tie tiks parādīti tikai pēc tam, kad aptauja būs beigusies.',
                 'length' => '',
-                'length_days_suffix' => '',
-                'length_info' => '',
-                'max_options' => '',
-                'max_options_info' => '',
-                'options' => '',
-                'options_info' => '',
-                'title' => '',
-                'vote_change' => '',
-                'vote_change_info' => '',
+                'length_days_suffix' => 'dienas',
+                'length_info' => 'Atstāt tukšu priekš nekad nebeidzošas aptaujas',
+                'max_options' => 'Opciju daudzums lietotājam',
+                'max_options_info' => 'Šis ir cik daudz opcijas katrs lietotājs var izvēlēties kad balso.',
+                'options' => 'Opcijas',
+                'options_info' => 'Saliec katru opciju uz jaunas līnijas. Tu vari ievadīt līdz 10 opcijām.',
+                'title' => 'Jautājums',
+                'vote_change' => 'Atļaut pārbalsot.',
+                'vote_change_info' => 'Ja ieslēgts, lietotāji var izmainīt savu balsi.',
             ],
         ],
 
@@ -343,7 +343,7 @@
                 'user' => [
                     'count' => '{0} nav balsu|{1} :count_delimited balss|[2,*] :count_delimited balsis',
                     'current' => 'Jums palikušas :votes balsis.',
-                    'not_enough' => "",
+                    'not_enough' => "Tev vairs nav atlikušu balsu",
                 ],
             ],
 
@@ -360,20 +360,20 @@
                 ],
 
                 'detail' => [
-                    'end_time' => '',
-                    'ended' => '',
-                    'results_hidden' => '',
-                    'total' => '',
+                    'end_time' => 'Balsošana beigsies :time',
+                    'ended' => 'Balsošana beidzās :time',
+                    'results_hidden' => 'Rezultāti tiks parādīti kad aptauja beigsies.',
+                    'total' => 'Balsis kopā: :count',
                 ],
             ],
         ],
 
         'watch' => [
-            'to_not_watching' => '',
-            'to_watching' => '',
-            'to_watching_mail' => '',
-            'tooltip_mail_disable' => '',
-            'tooltip_mail_enable' => '',
+            'to_not_watching' => 'Nav izcelts',
+            'to_watching' => 'Izceltie',
+            'to_watching_mail' => 'Izcelt ar paziņojumiem',
+            'tooltip_mail_disable' => 'Paziņojumi ir ieslēgti. Uzspiest lai izslēgtu',
+            'tooltip_mail_enable' => 'Paziņojumi ir izslēgti. Uzspiest lai ieslēgtu',
         ],
     ],
 ];
diff --git a/resources/lang/lv-LV/home.php b/resources/lang/lv-LV/home.php
index 4bba70358f9..ebcc9717961 100644
--- a/resources/lang/lv-LV/home.php
+++ b/resources/lang/lv-LV/home.php
@@ -5,15 +5,16 @@
 
 return [
     'landing' => [
-        'download' => '',
-        'online' => '',
-        'peak' => '',
-        'players' => '',
-        'title' => '',
-        'see_more_news' => '',
+        'download' => 'Lejupielādēt tagad',
+        'online' => '<strong>:players</strong> pašlaik tiešsaistē
+<strong>:games</strong> spēles',
+        'peak' => 'Visvairāk, :count lietotāji tiešsaistē',
+        'players' => '<strong>:count</strong> reģistrētie spēlētāji',
+        'title' => 'esi sveicināts',
+        'see_more_news' => 'skatīt vairāk jaunumus',
 
         'slogan' => [
-            'main' => '',
+            'main' => 'vislabākā brīvā ritma spēle',
             'sub' => 'ritms ir tikai klikšķa attālumā',
         ],
     ],
@@ -22,14 +23,14 @@
         'advanced_link' => 'Izvērstā meklēšana',
         'button' => 'Meklēt',
         'empty_result' => 'Nekas nav atrasts!',
-        'keyword_required' => '',
+        'keyword_required' => 'Meklēšanas atslēgvārds ir nepieciešams',
         'placeholder' => 'rakstiet, lai meklētu',
         'title' => 'meklēt',
 
         'beatmapset' => [
             'login_required' => 'Ielogojieties, lai meklētu bītmapes',
-            'more' => '',
-            'more_simple' => '',
+            'more' => ':count vairāk ritma-mapju meklēšanas rezultāti',
+            'more_simple' => 'Redzēt vairāk ritma-mapju meklēšanas rezultātus',
             'title' => 'Bītmapes',
         ],
 
@@ -37,14 +38,14 @@
             'all' => 'Visi forumi',
             'link' => 'Meklēt forumā',
             'login_required' => 'Ieiet, lai meklētu forumā',
-            'more_simple' => '',
+            'more_simple' => 'Redzēt vairāk foruma meklēšanas rezultātus',
             'title' => 'Forums',
 
             'label' => [
                 'forum' => 'meklēšana Forumos',
                 'forum_children' => 'iekļaut apakšforumus',
                 'include_deleted' => 'iekļaut dzēstos rakstus',
-                'topic_id' => '',
+                'topic_id' => 'temats #',
                 'username' => 'autors',
             ],
         ],
@@ -61,12 +62,12 @@
             'login_required' => 'Ieiet, lai meklētu',
             'more' => ':count vairāki spēlētāji meklēšanas rezultātā',
             'more_simple' => 'Rādīt vairāk spēlētāju meklēšanas rezultātus',
-            'more_hidden' => '',
+            'more_hidden' => 'Spēlētāju meklētājs ir limitēts līdz :max spēlētājiem. Pamēģini precizēt meklējamo. ',
             'title' => 'Spēlētāji',
         ],
 
         'wiki_page' => [
-            'link' => '',
+            'link' => 'Meklēt vikipēdijā',
             'more_simple' => 'Rādīt vairāk wiki meklēšanas rezultātus',
             'title' => 'Wiki',
         ],
@@ -74,25 +75,25 @@
 
     'download' => [
         'action' => 'Lejupielādēt osu!',
-        'action_lazer' => '',
-        'action_lazer_description' => '',
-        'action_lazer_info' => '',
-        'action_lazer_title' => '',
-        'action_title' => '',
-        'for_os' => '',
+        'action_lazer' => 'Ielādēt osu!(lazer)',
+        'action_lazer_description' => 'nākamais lielais atjauninājums osu!',
+        'action_lazer_info' => 'apskatīt šo lapu priekš vairāk informācijas',
+        'action_lazer_title' => 'pamēģini osu!(lazer)',
+        'action_title' => 'ielādēt osu!',
+        'for_os' => 'priekš :os',
         'macos-fallback' => 'macOS lietotāji',
         'mirror' => 'instalācija',
-        'or' => '',
-        'os_version_or_later' => '',
-        'other_os' => '',
-        'quick_start_guide' => '',
+        'or' => 'vai',
+        'os_version_or_later' => ':os_version vai jaunāku ',
+        'other_os' => 'citas platformas',
+        'quick_start_guide' => 'ātra sākuma pamācība',
         'tagline' => "sagatavosim <br> tevi!",
         'video-guide' => 'video pamācība',
 
         'help' => [
-            '_' => '',
-            'help_forum_link' => '',
-            'support_button' => '',
+            '_' => 'ja tev ir problēma ar spēles uzsākšanu vai konta reģistrēšanu, :help_forum_link vai :support_button.',
+            'help_forum_link' => 'apskatīt palīdzības forumu',
+            'support_button' => 'kontaktēt atbalstu',
         ],
 
         'os' => [
diff --git a/resources/lang/lv-LV/layout.php b/resources/lang/lv-LV/layout.php
index 7d99e10fb75..54749650628 100644
--- a/resources/lang/lv-LV/layout.php
+++ b/resources/lang/lv-LV/layout.php
@@ -5,7 +5,7 @@
 
 return [
     'audio' => [
-        'autoplay' => '',
+        'autoplay' => 'Spēlēt nākamo sarakstu automātiski',
     ],
 
     'defaults' => [
@@ -18,20 +18,20 @@
             'beatmapset_covers' => '',
             'contest' => '',
             'contests' => '',
-            'root' => '',
+            'root' => 'konsole',
         ],
 
         'artists' => [
-            'index' => '',
+            'index' => 'saraksts',
         ],
 
         'beatmapsets' => [
-            'show' => '',
-            'discussions' => '',
+            'show' => 'info',
+            'discussions' => 'diskusija',
         ],
 
         'changelog' => [
-            'index' => '',
+            'index' => 'saraksts',
         ],
 
         'help' => [
@@ -46,7 +46,7 @@
         ],
 
         'tournaments' => [
-            'index' => '',
+            'index' => 'saraksts',
         ],
 
         'users' => [
@@ -97,7 +97,7 @@
             '_' => 'Vispārīgi',
             'home' => 'Sākums',
             'changelog-index' => 'Izmaiņu saraksts',
-            'beatmaps' => '',
+            'beatmaps' => 'Ritma-mapju Saraksts',
             'download' => 'Lejupielādēt osu!',
         ],
         'help' => [
@@ -109,7 +109,7 @@
             'wiki' => 'Wiki',
         ],
         'legal' => [
-            '_' => '',
+            '_' => 'Legālais & Statuss',
             'copyright' => 'Autortiesības (DMCA)',
             'jp_sctl' => '',
             'privacy' => 'Konfidencialitāte',
@@ -125,8 +125,8 @@
             'description' => '',
         ],
         '404' => [
-            'error' => '',
-            'description' => "",
+            'error' => 'Lapa trūkst',
+            'description' => "Piedod, bet lapa kuru tu esi pieprasījis nav šeit!",
         ],
         '403' => [
             'error' => "Tev šeit nevajedzētu būt.",
@@ -134,11 +134,11 @@
         ],
         '401' => [
             'error' => "Tev šeit nevajedzētu būt.",
-            'description' => '',
+            'description' => 'Tu varētu mēģināt iet atpakaļ. Vai varbūt pierakstīties.',
         ],
         '405' => [
             'error' => 'Lapas Trūkst',
-            'description' => "",
+            'description' => "Piedod, bet lapa kuru tu esi pieprasījis nav šeit!",
         ],
         '422' => [
             'error' => '',
@@ -150,32 +150,32 @@
         ],
         '500' => [
             'error' => 'Ak nē! Kaut kas salūza! ;_;',
-            'description' => "",
+            'description' => "Mums automātiski paziņo par katru kļūdu.",
         ],
         'fatal' => [
             'error' => 'Ak nē! Kaut kas salūza (ļoti)! ;_;',
-            'description' => "",
+            'description' => "Mums automātiski paziņo par katru kļūdu.",
         ],
         '503' => [
-            'error' => '',
-            'description' => "",
+            'error' => 'Izslēgts remontdarbu dēļ!',
+            'description' => "Parasti remonti var aizņemt no 5 sekundēm līdz 10 minūtēm. Ja remonti notiek ilgāk, apskatīt :link priekš vairāk informācijas.",
             'link' => [
                 'text' => '',
                 'href' => '',
             ],
         ],
         // used by sentry if it returns an error
-        'reference' => "",
+        'reference' => "Tikai drošības dēļ, te ir kods, kuru tu vari iedot atbalstam!",
     ],
 
     'popup_login' => [
-        'button' => '',
+        'button' => 'pierakstīties / reģistrēties',
 
         'login' => [
-            'forgot' => "",
+            'forgot' => "Esmu aizmirsis/usi savus datus",
             'password' => 'parole',
             'title' => 'Ielogojieties, lai turpinātu',
-            'username' => '',
+            'username' => 'lietotājvārds',
 
             'error' => [
                 'email' => "Lietotājvārds vai e-pasta adrese neeksistē",
@@ -195,12 +195,13 @@
             'account-edit' => 'Iestatījumi',
             'follows' => '',
             'friends' => 'Draugi',
-            'legacy_score_only_toggle' => '',
-            'legacy_score_only_toggle_tooltip' => '',
+            'legacy_score_only_toggle' => 'Lazer režīms',
+            'legacy_score_only_toggle_tooltip' => 'Lazer režīms rāda rezultātus, kuri ir uzstādīti no lazer ar jauno skaitīšanas algoritmu',
             'logout' => 'Iziet',
             'profile' => 'Mans Profils',
-            'scoring_mode_toggle' => '',
-            'scoring_mode_toggle_tooltip' => '',
+            'scoring_mode_toggle' => 'Klasiskā skaitīšana',
+            'scoring_mode_toggle_tooltip' => 'Pielāgot rezultātus klasiskākai vērtēšanas sistēmai',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/lv-LV/livestreams.php b/resources/lang/lv-LV/livestreams.php
index 5dcc4c038d6..a35dbba7be4 100644
--- a/resources/lang/lv-LV/livestreams.php
+++ b/resources/lang/lv-LV/livestreams.php
@@ -5,8 +5,8 @@
 
 return [
     'promote' => [
-        'pin' => '',
-        'unpin' => "",
+        'pin' => 'Vai tu esi drošs ka vēlies reklamēt šo tiešraidi?',
+        'unpin' => "Vai tu esi drošs ka vēlies noņem šīs tiešraides reklāmu?",
     ],
 
     'top-headers' => [
diff --git a/resources/lang/lv-LV/model_validation.php b/resources/lang/lv-LV/model_validation.php
index 1352fe682bd..8e27b021dda 100644
--- a/resources/lang/lv-LV/model_validation.php
+++ b/resources/lang/lv-LV/model_validation.php
@@ -4,11 +4,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'invalid' => '',
+    'invalid' => 'Nepareizs :attribute specificēts.',
     'not_negative' => ':attribute nevar būt negatīvs.',
     'required' => ':attribute ir nepieciešams.',
     'too_long' => ':attribute pārsniedza maksimālo garumu - drīkst būt tikai līdz :limit zīmēm.',
-    'url' => '',
+    'url' => 'Lūdzu ievadi pareizu URL.',
     'wrong_confirmation' => 'Apstiprinājums nesakrīt.',
 
     'beatmapset_discussion' => [
@@ -25,7 +25,7 @@
         ],
 
         'hype' => [
-            'discussion_locked' => "",
+            'discussion_locked' => "Šī ritma-mape ir pašlaik aizvērta diskusijām, un to nevar ",
             'guest' => 'Ir jāielogojas, lai publicizētu.',
             'hyped' => 'Tu jau esi publicizējis šo bītmapi.',
             'limit_exceeded' => 'Tu esi izmantojis visus savus publicizējumus.',
diff --git a/resources/lang/lv-LV/models.php b/resources/lang/lv-LV/models.php
index dc2f9df0ab5..8b76eb71b76 100644
--- a/resources/lang/lv-LV/models.php
+++ b/resources/lang/lv-LV/models.php
@@ -4,10 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'not_found' => "",
+    'not_found' => "Specificētais :model netika atrasts.",
 
     'name' => [
-        'App\Models\Beatmap' => '',
-        'App\Models\Beatmapset' => '',
+        'App\Models\Beatmap' => 'ritma-mapes grūtība',
+        'App\Models\Beatmapset' => 'ritma-mape',
     ],
 ];
diff --git a/resources/lang/lv-LV/multiplayer.php b/resources/lang/lv-LV/multiplayer.php
index e538bcf13ca..55d3efbaf30 100644
--- a/resources/lang/lv-LV/multiplayer.php
+++ b/resources/lang/lv-LV/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Ilgums ir pārāk garš.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/lv-LV/news.php b/resources/lang/lv-LV/news.php
index 8c85cc7e8aa..91afc730ed7 100644
--- a/resources/lang/lv-LV/news.php
+++ b/resources/lang/lv-LV/news.php
@@ -27,18 +27,18 @@
         ],
 
         'title' => [
-            '_' => '',
-            'info' => '',
+            '_' => 'jaunumi',
+            'info' => 'raksts',
         ],
     ],
 
     'sidebar' => [
-        'archive' => '',
+        'archive' => 'Jaunumu Arhīvs',
     ],
 
     'store' => [
-        'button' => '',
-        'ok' => '',
+        'button' => 'Atjauninājums',
+        'ok' => 'Preču saraksts atjaunināts.',
     ],
 
     'update' => [
diff --git a/resources/lang/lv-LV/page_title.php b/resources/lang/lv-LV/page_title.php
index 2a6fbe54c4f..eb369e9f541 100644
--- a/resources/lang/lv-LV/page_title.php
+++ b/resources/lang/lv-LV/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/lv-LV/score_tokens.php b/resources/lang/lv-LV/score_tokens.php
index 88f37c38cc3..9d39dc41d17 100644
--- a/resources/lang/lv-LV/score_tokens.php
+++ b/resources/lang/lv-LV/score_tokens.php
@@ -5,7 +5,7 @@
 
 return [
     'create' => [
-        'beatmap_hash_invalid' => '',
-        'submission_disabled' => '',
+        'beatmap_hash_invalid' => 'nepareiza vai trūkstoša dziesma_hash',
+        'submission_disabled' => 'rezultātu iesūtīšana ir izslēgta',
     ],
 ];
diff --git a/resources/lang/lv-LV/store.php b/resources/lang/lv-LV/store.php
index 38685c3ac56..a56a35e2887 100644
--- a/resources/lang/lv-LV/store.php
+++ b/resources/lang/lv-LV/store.php
@@ -5,9 +5,9 @@
 
 return [
     'cart' => [
-        'checkout' => 'Pirkuma noformēšana',
-        'empty_cart' => '',
-        'info' => '',
+        'checkout' => 'Pirkuma norēķināšanās ',
+        'empty_cart' => 'Noņemt visas preces no groza',
+        'info' => ':count_delimited prece grozā ($:subtotal)|:count_delimited prece grozā ($:subtotal)',
         'more_goodies' => '',
         'shipping_fees' => 'piegādes maksas',
         'title' => 'Iepirkumu grozs',
@@ -21,21 +21,21 @@
         'empty' => [
             'text' => 'Jūsu grozs ir tukšs.',
             'return_link' => [
-                '_' => '',
+                '_' => 'Atgriezties uz :link lai atrastu dažus labumiņus!',
                 'link_text' => '',
             ],
         ],
     ],
 
     'checkout' => [
-        'cart_problems' => '',
+        'cart_problems' => 'Ak nē, ir izveidojušās problēmas ar tavu grozu!',
         'cart_problems_edit' => '',
         'declined' => '',
         'delayed_shipping' => '',
         'hide_from_activity' => 'Slēpt visus osu!supporter tagus šajā pasūtījumā no manas aktivitātes',
         'old_cart' => '',
-        'pay' => '',
-        'title_compact' => '',
+        'pay' => 'Norēķināties ar PayPal',
+        'title_compact' => 'norēķināšanās',
 
         'has_pending' => [
             '_' => '',
@@ -49,24 +49,24 @@
     ],
 
     'discount' => 'atlaide :percent %',
-    'free' => '',
+    'free' => 'par brīvu!',
 
     'invoice' => [
-        'contact' => '',
-        'date' => '',
-        'echeck_delay' => '',
+        'contact' => 'Sazinies:',
+        'date' => 'Datums:',
+        'echeck_delay' => 'Tā kā jūsu samakasa bija e-samaksa, lūdzu pagaidīt līdz 10 papildus dienām, lai samaksa izietu cauri PayPal!',
         'hide_from_activity' => 'osu!supporter tagi šajā pasūtījumā netiek rādīti jūsu nesenajās aktivitātēs.',
-        'sent_via' => '',
-        'shipping_to' => '',
-        'title' => '',
-        'title_compact' => '',
+        'sent_via' => 'Aizsūtīt Caur:',
+        'shipping_to' => 'Aizsūtīt Uz:',
+        'title' => 'Rēķins',
+        'title_compact' => 'rēķins',
 
         'status' => [
             'cancelled' => [
-                'title' => '',
+                'title' => 'Jūsu pasūtījums ir atcelts ',
                 'line_1' => [
                     '_' => "",
-                    'link_text' => '',
+                    'link_text' => 'osu!veikala atbalsts',
                 ],
             ],
             'delivered' => [
@@ -85,31 +85,31 @@
                 'title' => '',
                 'line_1' => '',
                 'line_2' => [
-                    '_' => '',
-                    'link_text' => '',
+                    '_' => 'Ja tu sastapies ar problēmu, kamēr norēķinājies, :link',
+                    'link_text' => 'uzspiest šeit lai turpinātu norēķināšanos',
                 ],
             ],
             'shipped' => [
-                'title' => '',
-                'tracking_details' => '',
+                'title' => 'Tavs pasūtījums ir piegādāts!',
+                'tracking_details' => 'Izsekošanas saturs seko:',
                 'no_tracking_details' => [
                     '_' => "",
-                    'link_text' => '',
+                    'link_text' => 'atsūti mums e-pastu',
                 ],
             ],
         ],
     ],
 
     'order' => [
-        'cancel' => '',
-        'cancel_confirm' => '',
-        'cancel_not_allowed' => '',
-        'invoice' => '',
-        'no_orders' => '',
-        'paid_on' => '',
-        'resume' => '',
-        'shipping_and_handling' => '',
-        'shopify_expired' => '',
+        'cancel' => 'Atcelt Pasūtījumu',
+        'cancel_confirm' => 'Šo pasūtījumu atcels un samaksa netiks pieņemta par to. Samaksas apgādātājs iespējams neatgriezīs naudu uzreiz. Vai tu esi drošs?',
+        'cancel_not_allowed' => 'Šo pasūtījumu pašlaik nevar atcelt.',
+        'invoice' => 'Apskatīt Čeku',
+        'no_orders' => 'Nav redzamu pasūtījumu.',
+        'paid_on' => 'Pasūtījums apstiprināts :date',
+        'resume' => 'Turpināt Norēķināšanos',
+        'shipping_and_handling' => 'Transportēšana & Apstrāde',
+        'shopify_expired' => 'Šī pasūtījuma norēķināšanās saitei ir beidzies derīguma termiņš.',
         'subtotal' => '',
         'total' => '',
 
@@ -186,12 +186,12 @@
 
         'require_login' => [
             '_' => 'Jums ir nepiciešams būt :link, lai iegūtu osu!supporter!',
-            'link_text' => '',
+            'link_text' => 'pierakstījies',
         ],
     ],
 
     'username_change' => [
-        'check' => '',
+        'check' => 'Ievadi lietotājvārdu lai redzētu tā pieejamību!',
         'checking' => '',
         'placeholder' => '',
         'label' => '',
@@ -199,7 +199,7 @@
 
         'require_login' => [
             '_' => '',
-            'link_text' => '',
+            'link_text' => 'pierakstījies',
         ],
     ],
 
diff --git a/resources/lang/lv-LV/teams.php b/resources/lang/lv-LV/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/lv-LV/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/lv-LV/users.php b/resources/lang/lv-LV/users.php
index 5fe5cef26f6..cb5fe9ce059 100644
--- a/resources/lang/lv-LV/users.php
+++ b/resources/lang/lv-LV/users.php
@@ -33,14 +33,14 @@
 
     'blocks' => [
         'banner_text' => 'Jūs esiet nobloķējis šo lietotāju.',
-        'comment_text' => '',
+        'comment_text' => 'Šis komentārs ir paslēpts.',
         'blocked_count' => 'bloķētie lietotāji (:count)',
         'hide_profile' => 'Slēpt profilu',
-        'hide_comment' => '',
-        'forum_post_text' => '',
+        'hide_comment' => 'paslēpt',
+        'forum_post_text' => 'Šis raksts ir paslēpts.',
         'not_blocked' => 'Šis lietotājs nav bloķēts.',
         'show_profile' => 'Rādīt profilu',
-        'show_comment' => '',
+        'show_comment' => 'rādīt',
         'too_many' => 'Ir sasniegts bloķēsanas limits.',
         'button' => [
             'block' => 'Bloķēt',
@@ -49,29 +49,29 @@
     ],
 
     'card' => [
-        'gift_supporter' => '',
+        'gift_supporter' => 'Uzdāvināt supporter statusu.',
         'loading' => 'Notiek ielāde...',
         'send_message' => 'nosūtīt ziņu',
     ],
 
     'create' => [
         'form' => [
-            'password' => '',
-            'password_confirmation' => '',
-            'submit' => '',
-            'user_email' => '',
-            'user_email_confirmation' => '',
-            'username' => '',
+            'password' => 'parole',
+            'password_confirmation' => 'paroles apstiprināšana',
+            'submit' => 'izveidot kontu',
+            'user_email' => 'e-pasts',
+            'user_email_confirmation' => 'e-pasta apstiprināšana',
+            'username' => 'lietotājvārds',
 
             'tos_notice' => [
-                '_' => '',
-                'link' => '',
+                '_' => 'izveidojot kontu, tu piekrīti :link',
+                'link' => 'pakalpojumu sniegšanas noteikumi',
             ],
         ],
     ],
 
     'disabled' => [
-        'title' => '',
+        'title' => 'Ak nē! Izskatās ka tavs konts ir atslēgts.',
         'warning' => "",
 
         'if_mistake' => [
@@ -84,21 +84,21 @@
             'opening' => '',
 
             'tos' => [
-                '_' => '',
+                '_' => 'Tu esi pārkāpis vienu vai vairākus no mūsu :community_rules vai :tos.',
                 'community_rules' => '',
-                'tos' => '',
+                'tos' => 'lietošanas noteikumi',
             ],
         ],
     ],
 
     'filtering' => [
-        'by_game_mode' => '',
+        'by_game_mode' => 'Lietotāji spēles veidā',
     ],
 
     'force_reactivation' => [
         'reason' => [
-            'inactive' => "",
-            'inactive_different_country' => "",
+            'inactive' => "Tavs konts nav ilgi ticis izmantots.",
+            'inactive_different_country' => "Tavs konts nav ilgi ticis izmantots.",
         ],
     ],
 
@@ -106,11 +106,11 @@
         '_' => 'Ienākt',
         'button' => 'Ienākt',
         'button_posting' => 'Savienojas...',
-        'email_login_disabled' => '',
+        'email_login_disabled' => 'Pierakstīšanās ar e-pastu pašlaik nav iespējama. Lūdzu izmanto lietotājvārdu tā vietā.',
         'failed' => 'Nepareizi dati',
         'forgot' => 'Aizmirsāt paroli?',
-        'info' => '',
-        'invalid_captcha' => '',
+        'info' => 'Lūdzu pieraksties lai turpinātu',
+        'invalid_captcha' => 'Pārāk daudz neizdevušos pierakstīšanās mēģinājumu, lūdzu izpildi captcha un mēģini vēlreiz. (Atsvaidzini lapu ja captcha nav redzama)',
         'locked_ip' => 'jūsu IP adrese ir bloķēta. Lūdzu uzgaidiet pāris minūtes',
         'password' => 'Parole',
         'register' => "Nav osu! profila? Izveido jaunu",
@@ -125,13 +125,13 @@
     ],
 
     'ogp' => [
-        'modding_description' => '',
-        'modding_description_empty' => '',
+        'modding_description' => 'Ritma-mapes :counts',
+        'modding_description_empty' => 'Lietotājam nav ritma-mapes...',
 
         'description' => [
-            '_' => '',
-            'country' => '',
-            'global' => '',
+            '_' => 'Vieta (:ruleset): :global | :country',
+            'country' => 'Valsts :rank',
+            'global' => 'Globāli :rank',
         ],
     ],
 
@@ -161,7 +161,7 @@
 
         'options' => [
             'cheating' => 'Netīra spēle / Krāpšanās',
-            'multiple_accounts' => '',
+            'multiple_accounts' => 'Izmanto vairākus kontus',
             'insults' => 'Mani / citus apvainoja',
             'spam' => 'Spams',
             'unwanted_content' => 'Pievieno neatbilstošu saturu',
@@ -172,7 +172,7 @@
     'restricted_banner' => [
         'title' => 'Jūsu konts tika ierobežots!',
         'message' => 'Kamēr esiet ierobežots, jūs nevarēsiet sazināties ar citiem spēlētājiem un jūsu rezultāts būs pieejams tikai jums. Šis parasti mēdz būt rezultāts pateicoties automātiskam procesam un kas visticamāk tiks nolaists 24 stundu laikā. Ja vēlaties iesniegt apelāciju par jūsu ierobežojumu, lūgums <a href="mailto:accounts@ppy.sh">sazināties ar atbalsta komandu</a>.',
-        'message_link' => '',
+        'message_link' => 'Apskati šo lapu lai uzzinātu vairāk.',
     ],
     'show' => [
         'age' => ':age gadus vecs',
@@ -190,27 +190,27 @@
 
         'comments_count' => [
             '_' => '',
-            'count' => '',
+            'count' => ':count_delimited komentārs|:count_delimited komentāri',
         ],
         'cover' => [
-            'to_0' => '',
-            'to_1' => '',
+            'to_0' => 'Paslēpt pārvalku',
+            'to_1' => 'Rādīt pārvalku',
         ],
         'daily_challenge' => [
             'daily' => '',
             'daily_streak_best' => '',
             'daily_streak_current' => '',
-            'playcount' => '',
-            'title' => '',
-            'top_10p_placements' => '',
-            'top_50p_placements' => '',
+            'playcount' => 'Kopējais piedalīšanās skaits',
+            'title' => 'Ikdienas\nIzaicinājums',
+            'top_10p_placements' => 'Top 10% Novietojums',
+            'top_50p_placements' => 'Top 50% Novietojums',
             'weekly' => '',
             'weekly_streak_best' => '',
             'weekly_streak_current' => '',
 
             'unit' => [
-                'day' => '',
-                'week' => '',
+                'day' => ':valued',
+                'week' => ':valuew',
             ],
         ],
         'edit' => [
@@ -451,21 +451,21 @@
             'website' => 'Mājaslapa',
         ],
         'not_found' => [
-            'reason_1' => 'Viņi iespējams nomainīja savu lietotājvārdu.',
-            'reason_2' => 'Konts var nebūt pieejams sakarā ar drošības vai ļaunprātīgas izmantošanas saistībām.',
-            'reason_3' => 'Iespējams, ka esi ielaidis rakstveida kļūdu!',
-            'reason_header' => 'Šim ir pāris iespējami iemesli:',
+            'reason_1' => 'Meklējamais cilvēks, iespējams nomainīja savu lietotājvārdu.',
+            'reason_2' => 'Konts var nebūt uz kādu laiku pieejams, drošību vai ļaunprātīgu iemeslu dēļ.',
+            'reason_3' => 'Iespējams, ka esi izdarījis rakstveida kļūdu!',
+            'reason_header' => 'Šim ir pāris iespējamu iemeslu:',
             'title' => 'Lietotājs nav atrasts! ;_;',
         ],
         'page' => [
-            'button' => 'Rediģēt profila lapu',
+            'button' => 'rediģēt profila lapu',
             'description' => '<strong>es!</strong> ir personiski rediģējams lauks tavā profila lapā.',
             'edit_big' => 'Rediģēt es!',
             'placeholder' => 'Ievadi lapas saturu šeit',
 
             'restriction_info' => [
                 '_' => 'Tev jābūt :link, lai atvērtu šo iespēju.',
-                'link' => 'osu!atbalstītājs',
+                'link' => 'osu!supporter',
             ],
         ],
         'post_count' => [
@@ -474,9 +474,9 @@
         ],
         'rank' => [
             'country' => 'Valsts ranks pēc :mode',
-            'country_simple' => 'Valsts Rankējums',
+            'country_simple' => 'Valsts Pozīcijas',
             'global' => 'Globālais ranks pēc :mode',
-            'global_simple' => 'Globālais Rankējums',
+            'global_simple' => 'Globālās Pozīcijas',
             'highest' => '',
         ],
         'stats' => [
@@ -494,7 +494,7 @@
             'total_score' => '',
             // modding stats
             'graveyard_beatmapset_count' => '',
-            'loved_beatmapset_count' => 'Loved Bītmapes',
+            'loved_beatmapset_count' => 'Iemīlētās Ritma-Mapes',
             'pending_beatmapset_count' => '',
             'ranked_beatmapset_count' => '',
         ],
diff --git a/resources/lang/lv-LV/wiki.php b/resources/lang/lv-LV/wiki.php
index 69e4a6eeab6..2920c69a235 100644
--- a/resources/lang/lv-LV/wiki.php
+++ b/resources/lang/lv-LV/wiki.php
@@ -10,9 +10,9 @@
         'missing' => 'Pieprasītā lapa ":keyword" netika atrasta.',
         'missing_title' => 'Nav Atrasts',
         'missing_translation' => 'Pieprasītā lapa netika atrasta ar pašreizējo, izvēlēto valodu.',
-        'needs_cleanup_or_rewrite' => '',
+        'needs_cleanup_or_rewrite' => 'Šī lapa neatbilst osu! vikipēdijas standartiem, un to vajag nopulēt vai pārrakstīt. Ja tu vari izpalīdzēt, lūdzu apdomā atjaunināt artikulu!',
         'search' => 'Meklēt esošās lapas :link.',
-        'stub' => '',
+        'stub' => 'Šis artikuls nav pabeigts, un kāds to drīz paplašinās.',
         'toc' => 'Saturs',
 
         'edit' => [
diff --git a/resources/lang/ms-MY/admin.php b/resources/lang/ms-MY/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ms-MY/admin.php
+++ b/resources/lang/ms-MY/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ms-MY/beatmaps.php b/resources/lang/ms-MY/beatmaps.php
index 4748624cf5d..d1b959b1e56 100644
--- a/resources/lang/ms-MY/beatmaps.php
+++ b/resources/lang/ms-MY/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '',
diff --git a/resources/lang/ms-MY/common.php b/resources/lang/ms-MY/common.php
index 8dc455b4c2c..43ee2620038 100644
--- a/resources/lang/ms-MY/common.php
+++ b/resources/lang/ms-MY/common.php
@@ -22,6 +22,7 @@
         'admin' => '',
         'authorise' => '',
         'authorising' => '',
+        'back' => '',
         'back_to_previous' => '',
         'back_to_top' => '',
         'cancel' => '',
diff --git a/resources/lang/ms-MY/layout.php b/resources/lang/ms-MY/layout.php
index 516dfda6827..509dd15ba47 100644
--- a/resources/lang/ms-MY/layout.php
+++ b/resources/lang/ms-MY/layout.php
@@ -201,6 +201,7 @@
             'profile' => '',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ms-MY/multiplayer.php b/resources/lang/ms-MY/multiplayer.php
index 841c55c7fe1..d212911e519 100644
--- a/resources/lang/ms-MY/multiplayer.php
+++ b/resources/lang/ms-MY/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Tempoh terlalu panjang.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ms-MY/page_title.php b/resources/lang/ms-MY/page_title.php
index 2a6fbe54c4f..eb369e9f541 100644
--- a/resources/lang/ms-MY/page_title.php
+++ b/resources/lang/ms-MY/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/ms-MY/teams.php b/resources/lang/ms-MY/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ms-MY/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/nl/admin.php b/resources/lang/nl/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/nl/admin.php
+++ b/resources/lang/nl/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/nl/beatmaps.php b/resources/lang/nl/beatmaps.php
index a28b9ddda9b..70557200494 100644
--- a/resources/lang/nl/beatmaps.php
+++ b/resources/lang/nl/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Stem bijwerken mislukt',
diff --git a/resources/lang/nl/common.php b/resources/lang/nl/common.php
index e4743b1b65e..d106d65eb94 100644
--- a/resources/lang/nl/common.php
+++ b/resources/lang/nl/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrator',
         'authorise' => 'Autorisatie',
         'authorising' => 'Autoriseren...',
+        'back' => '',
         'back_to_previous' => 'Terug naar vorige positie',
         'back_to_top' => 'Terug naar boven',
         'cancel' => 'Annuleren',
diff --git a/resources/lang/nl/layout.php b/resources/lang/nl/layout.php
index 823d1054b60..5ee9a081553 100644
--- a/resources/lang/nl/layout.php
+++ b/resources/lang/nl/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mijn Profiel',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/nl/multiplayer.php b/resources/lang/nl/multiplayer.php
index 606aaf083b7..980410a75f0 100644
--- a/resources/lang/nl/multiplayer.php
+++ b/resources/lang/nl/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Tijdsduur te lang.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/nl/page_title.php b/resources/lang/nl/page_title.php
index a034c56bff4..83184817ca3 100644
--- a/resources/lang/nl/page_title.php
+++ b/resources/lang/nl/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'ranglijsten',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'toernooien',
         ],
diff --git a/resources/lang/nl/teams.php b/resources/lang/nl/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/nl/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/no/admin.php b/resources/lang/no/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/no/admin.php
+++ b/resources/lang/no/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/no/beatmaps.php b/resources/lang/no/beatmaps.php
index 5e65ab962b9..9593a873491 100644
--- a/resources/lang/no/beatmaps.php
+++ b/resources/lang/no/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Kunne ikke oppdatere stemme',
diff --git a/resources/lang/no/common.php b/resources/lang/no/common.php
index f810019363b..e16844a2b36 100644
--- a/resources/lang/no/common.php
+++ b/resources/lang/no/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autoriser',
         'authorising' => 'Autoriserer...',
+        'back' => '',
         'back_to_previous' => 'Returner til forrige posisjon',
         'back_to_top' => 'Tilbake til toppen',
         'cancel' => 'Avbryt',
diff --git a/resources/lang/no/layout.php b/resources/lang/no/layout.php
index 8856a482554..a6e49b1af23 100644
--- a/resources/lang/no/layout.php
+++ b/resources/lang/no/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Min Profil',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/no/multiplayer.php b/resources/lang/no/multiplayer.php
index f95a7091c18..8dcd9fae758 100644
--- a/resources/lang/no/multiplayer.php
+++ b/resources/lang/no/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Lengden er for lang.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/no/page_title.php b/resources/lang/no/page_title.php
index 9231ab4491f..c9421cb61d3 100644
--- a/resources/lang/no/page_title.php
+++ b/resources/lang/no/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'rangeringer',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turneringer',
         ],
diff --git a/resources/lang/no/teams.php b/resources/lang/no/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/no/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/pl/admin.php b/resources/lang/pl/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/pl/admin.php
+++ b/resources/lang/pl/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/pl/authorization.php b/resources/lang/pl/authorization.php
index 7ffaa6bf236..04fbecfd7f7 100644
--- a/resources/lang/pl/authorization.php
+++ b/resources/lang/pl/authorization.php
@@ -71,7 +71,7 @@
         'friends_only' => 'Ten użytkownik blokuje wiadomości od osób spoza listy znajomych.',
         'moderated' => 'Ten kanał jest obecnie w trybie tylko dla moderatorów.',
         'no_access' => 'Nie masz dostępu do tego kanału.',
-        'no_announce' => '',
+        'no_announce' => 'Nie posiadasz uprawnień do publikowania ogłoszeń.',
         'receive_friends_only' => 'Ten użytkownik może nie być w stanie odpowiedzieć, ponieważ blokujesz prywatne wiadomości od osób spoza listy znajomych.',
         'restricted' => 'Nie możesz wysyłać wiadomości po tym, jak twoje konto zostało uciszone, ograniczone lub zablokowane.',
         'silenced' => 'Nie możesz wysyłać wiadomości po tym, jak twoje konto zostało uciszone, ograniczone lub zablokowane.',
@@ -185,7 +185,7 @@
     'score' => [
         'pin' => [
             'disabled_type' => "Nie możesz przypiąć tego typu wyników",
-            'failed' => "Nie można przypiąć nieprzekazanego wyniku.",
+            'failed' => "Nie można przypiąć niezaliczonego wyniku.",
             'not_owner' => 'Nie możesz przypiąć czyjegoś wyniku.',
             'too_many' => 'Przypięto zbyt wiele wyników.',
         ],
diff --git a/resources/lang/pl/beatmap_discussions.php b/resources/lang/pl/beatmap_discussions.php
index 8ecc0bbe3f7..d7147ba41e3 100644
--- a/resources/lang/pl/beatmap_discussions.php
+++ b/resources/lang/pl/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Sprawdzanie nowych wiadomości...',
+        'has_updates' => 'Dyskusja zawiera nowe wiadomości, kliknij, aby odświeżyć.',
+        'no_updates' => 'Brak nowych wiadomości.',
+        'updating' => 'Aktualizowanie...',
     ],
 
     'reply' => [
diff --git a/resources/lang/pl/beatmaps.php b/resources/lang/pl/beatmaps.php
index a49abc1a03d..45320e5f7f0 100644
--- a/resources/lang/pl/beatmaps.php
+++ b/resources/lang/pl/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Aktualizacja oceny nie powiodła się',
diff --git a/resources/lang/pl/beatmapsets.php b/resources/lang/pl/beatmapsets.php
index 0da3b3a4f97..bf51c77fb93 100644
--- a/resources/lang/pl/beatmapsets.php
+++ b/resources/lang/pl/beatmapsets.php
@@ -17,7 +17,7 @@
 
     'download' => [
         'limit_exceeded' => 'Zwolnij, pograj więcej!',
-        'no_mirrors' => '',
+        'no_mirrors' => 'Brak dostępnych serwerów pobierania.',
     ],
 
     'featured_artist_badge' => [
diff --git a/resources/lang/pl/common.php b/resources/lang/pl/common.php
index 2a303328a91..6524a13d5ea 100644
--- a/resources/lang/pl/common.php
+++ b/resources/lang/pl/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrator',
         'authorise' => 'Autoryzuj',
         'authorising' => 'Autoryzowanie...',
+        'back' => '',
         'back_to_previous' => 'Powrót do poprzedniej pozycji',
         'back_to_top' => 'Powrót na górę',
         'cancel' => 'Anuluj',
diff --git a/resources/lang/pl/contest.php b/resources/lang/pl/contest.php
index 778d3118bab..20113b917ab 100644
--- a/resources/lang/pl/contest.php
+++ b/resources/lang/pl/contest.php
@@ -14,7 +14,7 @@
     ],
 
     'judge' => [
-        'comments' => '',
+        'comments' => 'komentarze',
         'hide_judged' => 'ukryj ocenione zgłoszenia',
         'nav_title' => 'oceniać',
         'no_current_vote' => 'jeszcze nie zagłosowałeś.',
diff --git a/resources/lang/pl/forum.php b/resources/lang/pl/forum.php
index eb1335e43ee..8cc4e336abe 100644
--- a/resources/lang/pl/forum.php
+++ b/resources/lang/pl/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Czy na pewno chcesz przywrócić wątek?',
         'deleted' => 'usunięty wątek',
         'go_to_latest' => 'pokaż najnowszy post',
-        'go_to_unread' => '',
+        'go_to_unread' => 'zobacz pierwszy nieprzeczytany post',
         'has_replied' => 'Twoja odpowiedź znajduje się w tym wątku',
         'in_forum' => 'forum: :forum',
         'latest_post' => ':when przez :user',
diff --git a/resources/lang/pl/layout.php b/resources/lang/pl/layout.php
index 008d9dd252f..134cda614b7 100644
--- a/resources/lang/pl/layout.php
+++ b/resources/lang/pl/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Mój profil',
             'scoring_mode_toggle' => 'Klasyczny wynik',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/pl/multiplayer.php b/resources/lang/pl/multiplayer.php
index e9ae453cea5..f5c691af270 100644
--- a/resources/lang/pl/multiplayer.php
+++ b/resources/lang/pl/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Czas trwania jest zbyt długi.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/pl/page_title.php b/resources/lang/pl/page_title.php
index bc2c378ba40..c5609f36aa1 100644
--- a/resources/lang/pl/page_title.php
+++ b/resources/lang/pl/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'rankingi',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnieje',
         ],
diff --git a/resources/lang/pl/teams.php b/resources/lang/pl/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/pl/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/pt-br/accounts.php b/resources/lang/pt-br/accounts.php
index 7222224efbf..ed25354b37d 100644
--- a/resources/lang/pt-br/accounts.php
+++ b/resources/lang/pt-br/accounts.php
@@ -64,7 +64,7 @@
     ],
 
     'github_user' => [
-        'info' => "Se você é um colaborador dos repositórios open-source do osu!, vincular sua conta do GitHub aqui associará suas entradas de changelog ao seu perfil do osu!. Contas do GitHub sem histórico de contribuições para o osu! não podem ser vinculadas.",
+        'info' => "Se você é um contribuidor dos repositórios de código aberto do osu!, vincular sua conta do GitHub aqui associará suas entradas ao registro de alterações com seu perfil do osu!. Contas do GitHub sem histórico de contribuições para o osu! não podem ser vinculadas.",
         'link' => 'Conectar conta do GitHub',
         'title' => 'GitHub',
         'unlink' => 'Desconectar conta do GitHub',
diff --git a/resources/lang/pt-br/admin.php b/resources/lang/pt-br/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/pt-br/admin.php
+++ b/resources/lang/pt-br/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/pt-br/authorization.php b/resources/lang/pt-br/authorization.php
index 1096e96c548..2a6ee9e7ad1 100644
--- a/resources/lang/pt-br/authorization.php
+++ b/resources/lang/pt-br/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Você deve definir uma pontuação num beatmap para adicionar uma marcação.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Apenas o proprietário da sala pode fechá-lo.',
         ],
     ],
 
diff --git a/resources/lang/pt-br/beatmap_discussions.php b/resources/lang/pt-br/beatmap_discussions.php
index 5229246239e..fd1bf753253 100644
--- a/resources/lang/pt-br/beatmap_discussions.php
+++ b/resources/lang/pt-br/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Verificando se há atualizações...',
+        'has_updates' => 'A discussão tem uma atualização, clique para atualizar.',
+        'no_updates' => 'Sem atualizações.',
+        'updating' => 'Atualizando...',
     ],
 
     'reply' => [
diff --git a/resources/lang/pt-br/beatmaps.php b/resources/lang/pt-br/beatmaps.php
index 2b000ebd38a..e86da54690a 100644
--- a/resources/lang/pt-br/beatmaps.php
+++ b/resources/lang/pt-br/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Falha ao atualizar votos',
diff --git a/resources/lang/pt-br/common.php b/resources/lang/pt-br/common.php
index ced7fd42de4..f17985b9473 100644
--- a/resources/lang/pt-br/common.php
+++ b/resources/lang/pt-br/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autorizar',
         'authorising' => 'Autorizando...',
+        'back' => '',
         'back_to_previous' => 'Voltar para posição anterior',
         'back_to_top' => 'Voltar ao topo',
         'cancel' => 'Cancelar',
diff --git a/resources/lang/pt-br/follows.php b/resources/lang/pt-br/follows.php
index 540a330adc2..ef2abe3b3e1 100644
--- a/resources/lang/pt-br/follows.php
+++ b/resources/lang/pt-br/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Limite de seguimento alcançado.',
     ],
 ];
diff --git a/resources/lang/pt-br/forum.php b/resources/lang/pt-br/forum.php
index 2075f6bfd43..37a3c36f0fa 100644
--- a/resources/lang/pt-br/forum.php
+++ b/resources/lang/pt-br/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Realmente restaurar tópico?',
         'deleted' => 'tópico excluído',
         'go_to_latest' => 'ver a ultima publicação',
-        'go_to_unread' => '',
+        'go_to_unread' => 'ver primeira publicação não lida',
         'has_replied' => 'Você respondeu a este tópico',
         'in_forum' => 'em :forum',
         'latest_post' => ':when por :user',
diff --git a/resources/lang/pt-br/layout.php b/resources/lang/pt-br/layout.php
index c5d6cf58449..b56c96a3459 100644
--- a/resources/lang/pt-br/layout.php
+++ b/resources/lang/pt-br/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Meu Perfil',
             'scoring_mode_toggle' => 'Pontuação clássica',
             'scoring_mode_toggle_tooltip' => 'Ajuste o valor das pontuações para parecerem  uma pontuação ilimitada clássica',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/pt-br/multiplayer.php b/resources/lang/pt-br/multiplayer.php
index 556cd67f9af..a54f0620cc3 100644
--- a/resources/lang/pt-br/multiplayer.php
+++ b/resources/lang/pt-br/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'A duração é muito longa.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/pt-br/page_title.php b/resources/lang/pt-br/page_title.php
index 31c227bb7c4..bb674e072a6 100644
--- a/resources/lang/pt-br/page_title.php
+++ b/resources/lang/pt-br/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'colocações',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'torneios',
         ],
diff --git a/resources/lang/pt-br/rankings.php b/resources/lang/pt-br/rankings.php
index 6f79a6c2eff..0c82ad75660 100644
--- a/resources/lang/pt-br/rankings.php
+++ b/resources/lang/pt-br/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Dificuldade',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Pontuações dos Melhores 10%',
+        'top_50p' => 'Pontuações dos Melhores 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/pt-br/teams.php b/resources/lang/pt-br/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/pt-br/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/pt/admin.php b/resources/lang/pt/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/pt/admin.php
+++ b/resources/lang/pt/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/pt/beatmaps.php b/resources/lang/pt/beatmaps.php
index 861c0aa6c48..d832182c91b 100644
--- a/resources/lang/pt/beatmaps.php
+++ b/resources/lang/pt/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Falha ao atualizar voto',
diff --git a/resources/lang/pt/common.php b/resources/lang/pt/common.php
index 8dd8730f1f1..be9b1419bad 100644
--- a/resources/lang/pt/common.php
+++ b/resources/lang/pt/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrador',
         'authorise' => 'Autorizar',
         'authorising' => 'A autorizar...',
+        'back' => '',
         'back_to_previous' => 'Voltar à posição anterior',
         'back_to_top' => 'Voltar ao topo',
         'cancel' => 'Cancelar',
diff --git a/resources/lang/pt/layout.php b/resources/lang/pt/layout.php
index 7ff627f990a..35b005e0316 100644
--- a/resources/lang/pt/layout.php
+++ b/resources/lang/pt/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'O meu perfil',
             'scoring_mode_toggle' => 'Pontuação clássica',
             'scoring_mode_toggle_tooltip' => 'Definir valores de pontuação para sentir-se mais como uma pontuação ilimitada clássica',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/pt/multiplayer.php b/resources/lang/pt/multiplayer.php
index 56d7c16128d..9a38d3a5716 100644
--- a/resources/lang/pt/multiplayer.php
+++ b/resources/lang/pt/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'A duração é muito longa.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/pt/page_title.php b/resources/lang/pt/page_title.php
index 77284d1cb96..fbc06eaddd9 100644
--- a/resources/lang/pt/page_title.php
+++ b/resources/lang/pt/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'classificação',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'torneios',
         ],
diff --git a/resources/lang/pt/teams.php b/resources/lang/pt/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/pt/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/ro/admin.php b/resources/lang/ro/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ro/admin.php
+++ b/resources/lang/ro/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ro/authorization.php b/resources/lang/ro/authorization.php
index 5625e4d1eff..71531e33f3a 100644
--- a/resources/lang/ro/authorization.php
+++ b/resources/lang/ro/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Trebuie să ai un scor pe acest beatmap pentru a adăuga o etichetă.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Doar proprietarul camerei o poate închide.',
         ],
     ],
 
diff --git a/resources/lang/ro/beatmap_discussions.php b/resources/lang/ro/beatmap_discussions.php
index 7fd4260fdc5..fec211cbb86 100644
--- a/resources/lang/ro/beatmap_discussions.php
+++ b/resources/lang/ro/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Se caută actualizări...',
+        'has_updates' => 'Discuția are actualizări, apasă pentru a reîmprospăta.',
+        'no_updates' => 'Nu există actualizări.',
+        'updating' => 'Se actualizează...',
     ],
 
     'reply' => [
diff --git a/resources/lang/ro/beatmaps.php b/resources/lang/ro/beatmaps.php
index 127add53873..4653a18ee12 100644
--- a/resources/lang/ro/beatmaps.php
+++ b/resources/lang/ro/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Actualizarea votului a eșuat',
diff --git a/resources/lang/ro/common.php b/resources/lang/ro/common.php
index a96445013c0..5168b0e66b7 100644
--- a/resources/lang/ro/common.php
+++ b/resources/lang/ro/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Autorizează',
         'authorising' => 'Se autorizează...',
+        'back' => '',
         'back_to_previous' => 'Revino la poziția anterioară',
         'back_to_top' => 'Înapoi sus',
         'cancel' => 'Anulează',
diff --git a/resources/lang/ro/follows.php b/resources/lang/ro/follows.php
index 1eccd0ba77e..f26d20aecaa 100644
--- a/resources/lang/ro/follows.php
+++ b/resources/lang/ro/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'A fost atinsă limita de urmăriri.',
     ],
 ];
diff --git a/resources/lang/ro/forum.php b/resources/lang/ro/forum.php
index bb20abb65a0..2af0cd4f21c 100644
--- a/resources/lang/ro/forum.php
+++ b/resources/lang/ro/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Sigur dorești să restaurezi subiectul?',
         'deleted' => 'subiect șters',
         'go_to_latest' => 'vezi cea mai recentă postare',
-        'go_to_unread' => '',
+        'go_to_unread' => 'vizualizează prima postare necitită',
         'has_replied' => 'Ai răspuns în acest subiect',
         'in_forum' => 'in :forum',
         'latest_post' => ':when de :user',
diff --git a/resources/lang/ro/layout.php b/resources/lang/ro/layout.php
index 92d0e76c678..b61415b6e28 100644
--- a/resources/lang/ro/layout.php
+++ b/resources/lang/ro/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Profilul Meu',
             'scoring_mode_toggle' => 'Mod scor clasic',
             'scoring_mode_toggle_tooltip' => 'Ajustează valorile pentru o experiența mai apropiată de modul clasic de scor fără standardizare',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ro/multiplayer.php b/resources/lang/ro/multiplayer.php
index 91981710872..c00698f849f 100644
--- a/resources/lang/ro/multiplayer.php
+++ b/resources/lang/ro/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Durata este prea lungă.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ro/page_title.php b/resources/lang/ro/page_title.php
index 5600f77ca96..c497ba9ecd4 100644
--- a/resources/lang/ro/page_title.php
+++ b/resources/lang/ro/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'clasamente',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnee',
         ],
diff --git a/resources/lang/ro/rankings.php b/resources/lang/ro/rankings.php
index 2c9366c0b0e..947447ef670 100644
--- a/resources/lang/ro/rankings.php
+++ b/resources/lang/ro/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Dificultate',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Scor Top 10%',
+        'top_50p' => 'Scor Top 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/ro/teams.php b/resources/lang/ro/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ro/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/ru/admin.php b/resources/lang/ru/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/ru/admin.php
+++ b/resources/lang/ru/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/ru/authorization.php b/resources/lang/ru/authorization.php
index b453cd18afd..395d1c8753c 100644
--- a/resources/lang/ru/authorization.php
+++ b/resources/lang/ru/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Сыграйте эту карту, чтобы начать добавлять теги.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Эту комнату может закрыть только её создатель.',
         ],
     ],
 
diff --git a/resources/lang/ru/beatmap_discussions.php b/resources/lang/ru/beatmap_discussions.php
index 4fe043df7a4..4149952d921 100644
--- a/resources/lang/ru/beatmap_discussions.php
+++ b/resources/lang/ru/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Проверка...',
+        'has_updates' => 'Появились новые ответы. Нажмите для обновления.',
+        'no_updates' => 'Нет новых ответов.',
+        'updating' => 'Обновление...',
     ],
 
     'reply' => [
diff --git a/resources/lang/ru/beatmaps.php b/resources/lang/ru/beatmaps.php
index 4a0d4f4519c..e6a41e61f8e 100644
--- a/resources/lang/ru/beatmaps.php
+++ b/resources/lang/ru/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Не удалось проголосовать',
@@ -41,7 +45,7 @@
 
         'empty' => [
             'empty' => 'Нет отзывов!',
-            'hidden' => 'Ни один отзыв не соответствует указанному фильтру.',
+            'hidden' => 'Нет отзывов.',
         ],
 
         'lock' => [
diff --git a/resources/lang/ru/common.php b/resources/lang/ru/common.php
index b74b6edadfc..86878feccda 100644
--- a/resources/lang/ru/common.php
+++ b/resources/lang/ru/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Администратор',
         'authorise' => 'Авторизовать',
         'authorising' => 'Авторизация...',
+        'back' => '',
         'back_to_previous' => 'Вернуться',
         'back_to_top' => 'В начало',
         'cancel' => 'Отмена',
diff --git a/resources/lang/ru/follows.php b/resources/lang/ru/follows.php
index 250f28b6439..44c94f98cc4 100644
--- a/resources/lang/ru/follows.php
+++ b/resources/lang/ru/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Достигнут лимит подписок на маппинг.',
     ],
 ];
diff --git a/resources/lang/ru/forum.php b/resources/lang/ru/forum.php
index 9975cfb72a3..becf9f3b47b 100644
--- a/resources/lang/ru/forum.php
+++ b/resources/lang/ru/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Действительно восстановить тему?',
         'deleted' => 'удалённая тема',
         'go_to_latest' => 'перейти к последнему ответу',
-        'go_to_unread' => '',
+        'go_to_unread' => 'перейти к первому непрочитанному ответу',
         'has_replied' => 'Вы отвечали на эту тему',
         'in_forum' => 'в :forum',
         'latest_post' => ':when от :user',
@@ -372,8 +372,8 @@
             'to_not_watching' => 'Без подписки',
             'to_watching' => 'В подписки',
             'to_watching_mail' => 'В подписки с уведомлением',
-            'tooltip_mail_disable' => 'Уведомления включены. Нажмите, чтобы отключить',
-            'tooltip_mail_enable' => 'Уведомления отключены. Нажмите сюда, чтобы включить их',
+            'tooltip_mail_disable' => 'Уведомления включены. Нажмите сюда, чтобы отключить',
+            'tooltip_mail_enable' => 'Уведомления отключены. Нажмите сюда, чтобы включить',
         ],
     ],
 ];
diff --git a/resources/lang/ru/layout.php b/resources/lang/ru/layout.php
index a7a45aa744b..ad3fd565956 100644
--- a/resources/lang/ru/layout.php
+++ b/resources/lang/ru/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Мой профиль',
             'scoring_mode_toggle' => 'Классический вид очков',
             'scoring_mode_toggle_tooltip' => 'Приближённо возвращает игровые очки к классическому неограниченному алгоритму подсчёта',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/ru/multiplayer.php b/resources/lang/ru/multiplayer.php
index ab8c14cd39d..9a35a2de575 100644
--- a/resources/lang/ru/multiplayer.php
+++ b/resources/lang/ru/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Слишком большая продолжительность.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/ru/page_title.php b/resources/lang/ru/page_title.php
index af2444d647e..4e156828005 100644
--- a/resources/lang/ru/page_title.php
+++ b/resources/lang/ru/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'рейтинг',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'турниры',
         ],
diff --git a/resources/lang/ru/rankings.php b/resources/lang/ru/rankings.php
index d6c81e0c2ff..8e356eb43cb 100644
--- a/resources/lang/ru/rankings.php
+++ b/resources/lang/ru/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Сложность',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Минимальное значение очков в топ 10%',
+        'top_50p' => 'Минимальное значение очков в топ 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/ru/store.php b/resources/lang/ru/store.php
index 927d9b6029c..6a72327f4d9 100644
--- a/resources/lang/ru/store.php
+++ b/resources/lang/ru/store.php
@@ -70,7 +70,7 @@
                 ],
             ],
             'delivered' => [
-                'title' => 'Ваш заказ доставлен! Мы надеемся, что он вам понравился!',
+                'title' => 'Ваш заказ доставлен! Мы надеемся, что он вам понравится!',
                 'line_1' => [
                     '_' => 'Если у вас возникли проблемы с покупкой, пожалуйста, свяжитесь с :link.',
                     'link_text' => 'поддержкой osu!store',
diff --git a/resources/lang/ru/teams.php b/resources/lang/ru/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/ru/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/si-LK/admin.php b/resources/lang/si-LK/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/si-LK/admin.php
+++ b/resources/lang/si-LK/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/si-LK/beatmaps.php b/resources/lang/si-LK/beatmaps.php
index 215d208ace8..f898c4d3e28 100644
--- a/resources/lang/si-LK/beatmaps.php
+++ b/resources/lang/si-LK/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '',
diff --git a/resources/lang/si-LK/common.php b/resources/lang/si-LK/common.php
index 8dc455b4c2c..43ee2620038 100644
--- a/resources/lang/si-LK/common.php
+++ b/resources/lang/si-LK/common.php
@@ -22,6 +22,7 @@
         'admin' => '',
         'authorise' => '',
         'authorising' => '',
+        'back' => '',
         'back_to_previous' => '',
         'back_to_top' => '',
         'cancel' => '',
diff --git a/resources/lang/si-LK/layout.php b/resources/lang/si-LK/layout.php
index 516dfda6827..509dd15ba47 100644
--- a/resources/lang/si-LK/layout.php
+++ b/resources/lang/si-LK/layout.php
@@ -201,6 +201,7 @@
             'profile' => '',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/si-LK/multiplayer.php b/resources/lang/si-LK/multiplayer.php
index dc8c7f1e291..4c473b88477 100644
--- a/resources/lang/si-LK/multiplayer.php
+++ b/resources/lang/si-LK/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/si-LK/page_title.php b/resources/lang/si-LK/page_title.php
index 2a6fbe54c4f..eb369e9f541 100644
--- a/resources/lang/si-LK/page_title.php
+++ b/resources/lang/si-LK/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/si-LK/teams.php b/resources/lang/si-LK/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/si-LK/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/sk/admin.php b/resources/lang/sk/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/sk/admin.php
+++ b/resources/lang/sk/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/sk/beatmaps.php b/resources/lang/sk/beatmaps.php
index 8b8846f7a73..eecd31988f0 100644
--- a/resources/lang/sk/beatmaps.php
+++ b/resources/lang/sk/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Nastala chyba počas hlasovania',
diff --git a/resources/lang/sk/common.php b/resources/lang/sk/common.php
index 7bdc0c3c3f1..a6db81e37f0 100644
--- a/resources/lang/sk/common.php
+++ b/resources/lang/sk/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Administrátor',
         'authorise' => 'Autorizovať',
         'authorising' => 'Autorizovanie...',
+        'back' => '',
         'back_to_previous' => 'Návrat do predchádzajúceho stavu',
         'back_to_top' => 'Naspäť hore',
         'cancel' => 'Zrušiť',
diff --git a/resources/lang/sk/layout.php b/resources/lang/sk/layout.php
index 3b5b71ba905..167d5570858 100644
--- a/resources/lang/sk/layout.php
+++ b/resources/lang/sk/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Môj Profil',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/sk/multiplayer.php b/resources/lang/sk/multiplayer.php
index 66064fd1c41..408fb5709d2 100644
--- a/resources/lang/sk/multiplayer.php
+++ b/resources/lang/sk/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/sk/page_title.php b/resources/lang/sk/page_title.php
index 530bdfe3fed..915565633a3 100644
--- a/resources/lang/sk/page_title.php
+++ b/resources/lang/sk/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/sk/teams.php b/resources/lang/sk/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/sk/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/sl/admin.php b/resources/lang/sl/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/sl/admin.php
+++ b/resources/lang/sl/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/sl/beatmaps.php b/resources/lang/sl/beatmaps.php
index 6eeb698860d..73b9c9cf5be 100644
--- a/resources/lang/sl/beatmaps.php
+++ b/resources/lang/sl/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Neuspešna posodobitev glasovanja',
diff --git a/resources/lang/sl/common.php b/resources/lang/sl/common.php
index 6f587160f8b..a96dbb1045b 100644
--- a/resources/lang/sl/common.php
+++ b/resources/lang/sl/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Avtorizacija',
         'authorising' => 'Avtoriziranje...',
+        'back' => '',
         'back_to_previous' => 'Vrni se na prejšnjo pozicijo',
         'back_to_top' => 'Nazaj na vrh',
         'cancel' => 'Prekliči',
diff --git a/resources/lang/sl/layout.php b/resources/lang/sl/layout.php
index a46c4d4df5f..fd45bf69c91 100644
--- a/resources/lang/sl/layout.php
+++ b/resources/lang/sl/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Moj profil',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/sl/multiplayer.php b/resources/lang/sl/multiplayer.php
index e743ed807f7..f81f9465e6c 100644
--- a/resources/lang/sl/multiplayer.php
+++ b/resources/lang/sl/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Dolžina je predolga.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/sl/page_title.php b/resources/lang/sl/page_title.php
index 1e6e365fac3..c2218f95f02 100644
--- a/resources/lang/sl/page_title.php
+++ b/resources/lang/sl/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'uvrstitve',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnirji',
         ],
diff --git a/resources/lang/sl/teams.php b/resources/lang/sl/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/sl/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/sr/admin.php b/resources/lang/sr/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/sr/admin.php
+++ b/resources/lang/sr/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/sr/beatmaps.php b/resources/lang/sr/beatmaps.php
index cb2c2fb4bab..a21d8762968 100644
--- a/resources/lang/sr/beatmaps.php
+++ b/resources/lang/sr/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Дошло је до грешке са ажурирањем гласа',
diff --git a/resources/lang/sr/common.php b/resources/lang/sr/common.php
index b4cce2893e6..e3266453cc9 100644
--- a/resources/lang/sr/common.php
+++ b/resources/lang/sr/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Aдмин',
         'authorise' => 'Ауторизуј',
         'authorising' => 'Ауторизује се...',
+        'back' => '',
         'back_to_previous' => 'Повратак на претходни приказ',
         'back_to_top' => 'Назад на врх',
         'cancel' => 'Откажите',
diff --git a/resources/lang/sr/layout.php b/resources/lang/sr/layout.php
index eeb6a2589a6..fdae38174a4 100644
--- a/resources/lang/sr/layout.php
+++ b/resources/lang/sr/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Мој профил',
             'scoring_mode_toggle' => 'Класичан изглед резултата',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/sr/multiplayer.php b/resources/lang/sr/multiplayer.php
index e61cc3a0c51..885a2366227 100644
--- a/resources/lang/sr/multiplayer.php
+++ b/resources/lang/sr/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Трајање је предугачко.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/sr/page_title.php b/resources/lang/sr/page_title.php
index 779343d5bf6..9faa5c46525 100644
--- a/resources/lang/sr/page_title.php
+++ b/resources/lang/sr/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'рангови',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'турнири',
         ],
diff --git a/resources/lang/sr/teams.php b/resources/lang/sr/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/sr/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/sv/admin.php b/resources/lang/sv/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/sv/admin.php
+++ b/resources/lang/sv/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/sv/beatmaps.php b/resources/lang/sv/beatmaps.php
index cc24ff24924..738d72f54d4 100644
--- a/resources/lang/sv/beatmaps.php
+++ b/resources/lang/sv/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Kunde ej uppdatera röst',
diff --git a/resources/lang/sv/common.php b/resources/lang/sv/common.php
index 49c0e03581b..ac152998075 100644
--- a/resources/lang/sv/common.php
+++ b/resources/lang/sv/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Auktorisera',
         'authorising' => 'Auktoriserar...',
+        'back' => '',
         'back_to_previous' => 'Återgå till tidigare position',
         'back_to_top' => 'Tillbaka till toppen',
         'cancel' => 'Avbryt',
diff --git a/resources/lang/sv/layout.php b/resources/lang/sv/layout.php
index 71e440e45c9..7c3c5aa6aee 100644
--- a/resources/lang/sv/layout.php
+++ b/resources/lang/sv/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Min profil',
             'scoring_mode_toggle' => 'Klassiskt resultat',
             'scoring_mode_toggle_tooltip' => 'Justera poängvärden för att kännas mer som klassisk poängsättning utan tak',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/sv/multiplayer.php b/resources/lang/sv/multiplayer.php
index 10a91ca7eff..2fe32f3e750 100644
--- a/resources/lang/sv/multiplayer.php
+++ b/resources/lang/sv/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Varaktigheten är för lång.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/sv/page_title.php b/resources/lang/sv/page_title.php
index cfc64350162..aa38bd76903 100644
--- a/resources/lang/sv/page_title.php
+++ b/resources/lang/sv/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'rankningar',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turneringar',
         ],
diff --git a/resources/lang/sv/rankings.php b/resources/lang/sv/rankings.php
index 400433605fb..c75bdfafd60 100644
--- a/resources/lang/sv/rankings.php
+++ b/resources/lang/sv/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => '',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Topp 10% resultat',
+        'top_50p' => 'Topp 50% resultat',
     ],
 
     'filter' => [
@@ -36,7 +36,7 @@
     'type' => [
         'charts' => 'i rampljuset',
         'country' => 'land',
-        'daily_challenge' => '',
+        'daily_challenge' => 'daglig utmaning',
         'kudosu' => 'kudosu',
         'multiplayer' => 'flerspelarläge',
         'performance' => 'prestation',
diff --git a/resources/lang/sv/teams.php b/resources/lang/sv/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/sv/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/tg-TJ/admin.php b/resources/lang/tg-TJ/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/tg-TJ/admin.php
+++ b/resources/lang/tg-TJ/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/tg-TJ/beatmaps.php b/resources/lang/tg-TJ/beatmaps.php
index 215d208ace8..f898c4d3e28 100644
--- a/resources/lang/tg-TJ/beatmaps.php
+++ b/resources/lang/tg-TJ/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '',
diff --git a/resources/lang/tg-TJ/common.php b/resources/lang/tg-TJ/common.php
index 8dc455b4c2c..43ee2620038 100644
--- a/resources/lang/tg-TJ/common.php
+++ b/resources/lang/tg-TJ/common.php
@@ -22,6 +22,7 @@
         'admin' => '',
         'authorise' => '',
         'authorising' => '',
+        'back' => '',
         'back_to_previous' => '',
         'back_to_top' => '',
         'cancel' => '',
diff --git a/resources/lang/tg-TJ/layout.php b/resources/lang/tg-TJ/layout.php
index 516dfda6827..509dd15ba47 100644
--- a/resources/lang/tg-TJ/layout.php
+++ b/resources/lang/tg-TJ/layout.php
@@ -201,6 +201,7 @@
             'profile' => '',
             'scoring_mode_toggle' => '',
             'scoring_mode_toggle_tooltip' => '',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/tg-TJ/multiplayer.php b/resources/lang/tg-TJ/multiplayer.php
index dc8c7f1e291..4c473b88477 100644
--- a/resources/lang/tg-TJ/multiplayer.php
+++ b/resources/lang/tg-TJ/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/tg-TJ/page_title.php b/resources/lang/tg-TJ/page_title.php
index 2a6fbe54c4f..eb369e9f541 100644
--- a/resources/lang/tg-TJ/page_title.php
+++ b/resources/lang/tg-TJ/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '',
         ],
diff --git a/resources/lang/tg-TJ/teams.php b/resources/lang/tg-TJ/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/tg-TJ/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/th/admin.php b/resources/lang/th/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/th/admin.php
+++ b/resources/lang/th/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/th/beatmap_discussions.php b/resources/lang/th/beatmap_discussions.php
index 1540e3e769b..87c02b6c528 100644
--- a/resources/lang/th/beatmap_discussions.php
+++ b/resources/lang/th/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
+        'checking' => 'กำลังตรวจสอบการอัปเดต…',
         'has_updates' => '',
         'no_updates' => '',
-        'updating' => '',
+        'updating' => 'กำลังอัปเดต',
     ],
 
     'reply' => [
diff --git a/resources/lang/th/beatmaps.php b/resources/lang/th/beatmaps.php
index 72b8a667f5c..b2872aae309 100644
--- a/resources/lang/th/beatmaps.php
+++ b/resources/lang/th/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'ไม่สามารถอัปเดตการลงคะแนน',
diff --git a/resources/lang/th/common.php b/resources/lang/th/common.php
index 494ef2db287..9e6957cc775 100644
--- a/resources/lang/th/common.php
+++ b/resources/lang/th/common.php
@@ -22,6 +22,7 @@
         'admin' => 'ผู้ดูแล',
         'authorise' => 'อนุญาต',
         'authorising' => 'กำลังอนุญาต...',
+        'back' => '',
         'back_to_previous' => 'กลับไปยังตำแหน่งก่อนหน้านี้',
         'back_to_top' => 'กลับไปด้านบน',
         'cancel' => 'ยกเลิก',
diff --git a/resources/lang/th/layout.php b/resources/lang/th/layout.php
index 701acbe1a9f..78531fadb28 100644
--- a/resources/lang/th/layout.php
+++ b/resources/lang/th/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'โปรไฟล์ของฉัน',
             'scoring_mode_toggle' => 'การให้คะแนนแบบคลาสสิค',
             'scoring_mode_toggle_tooltip' => 'ปรับค่าคะแนนให้รู้สึกคล้ายกับการให้คะแนนแบบคลาสสิคที่ไม่มีขีดจำกัด',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/th/multiplayer.php b/resources/lang/th/multiplayer.php
index 4acc1fccf5b..e6a6c0c77d5 100644
--- a/resources/lang/th/multiplayer.php
+++ b/resources/lang/th/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'ระยะเวลายาวเกินไป',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/th/page_title.php b/resources/lang/th/page_title.php
index da7c11f62de..6434bb2de53 100644
--- a/resources/lang/th/page_title.php
+++ b/resources/lang/th/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'การจัดอันดับ',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '
 ทัวร์นาเมนต์',
diff --git a/resources/lang/th/teams.php b/resources/lang/th/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/th/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/tr/admin.php b/resources/lang/tr/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/tr/admin.php
+++ b/resources/lang/tr/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/tr/beatmaps.php b/resources/lang/tr/beatmaps.php
index 1625779e7cf..e4339337e61 100644
--- a/resources/lang/tr/beatmaps.php
+++ b/resources/lang/tr/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Oy güncelleme başarısız',
diff --git a/resources/lang/tr/common.php b/resources/lang/tr/common.php
index 7510f99637f..98b1d935b46 100644
--- a/resources/lang/tr/common.php
+++ b/resources/lang/tr/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Yönetici',
         'authorise' => 'Yetki ver',
         'authorising' => 'İzin Veriliyor...',
+        'back' => '',
         'back_to_previous' => 'Bir önceki pozisyona dön',
         'back_to_top' => 'Yukarıya geri dön',
         'cancel' => 'İptal',
diff --git a/resources/lang/tr/layout.php b/resources/lang/tr/layout.php
index e5cc05ce106..b2d486dac99 100644
--- a/resources/lang/tr/layout.php
+++ b/resources/lang/tr/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Profilim',
             'scoring_mode_toggle' => 'Klasik skorlama',
             'scoring_mode_toggle_tooltip' => 'Skorları klasik sınırsız skorlamaya benzeyecek şekilde ayarla',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/tr/multiplayer.php b/resources/lang/tr/multiplayer.php
index 7708ee7b50d..0ff7d782a36 100644
--- a/resources/lang/tr/multiplayer.php
+++ b/resources/lang/tr/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Süre aşırı uzun.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/tr/page_title.php b/resources/lang/tr/page_title.php
index 333e5b5d7c8..5e8e3773da6 100644
--- a/resources/lang/tr/page_title.php
+++ b/resources/lang/tr/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'sıralamalar',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'turnuvalar',
         ],
diff --git a/resources/lang/tr/teams.php b/resources/lang/tr/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/tr/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/uk/admin.php b/resources/lang/uk/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/uk/admin.php
+++ b/resources/lang/uk/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/uk/authorization.php b/resources/lang/uk/authorization.php
index 78f52bc0012..46a8c06a874 100644
--- a/resources/lang/uk/authorization.php
+++ b/resources/lang/uk/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Зіграйте цю мапу перед тим як додавати теги.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Тільки власник кімнати може закрити її.',
         ],
     ],
 
diff --git a/resources/lang/uk/beatmap_discussions.php b/resources/lang/uk/beatmap_discussions.php
index b383bd18283..fa01ca57610 100644
--- a/resources/lang/uk/beatmap_discussions.php
+++ b/resources/lang/uk/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Перевіряємо, чи є нові дописи...',
+        'has_updates' => 'Нові дописи в обговоренні, натисніть для оновлення.',
+        'no_updates' => 'Немає нових дописів.',
+        'updating' => 'Оновлення...',
     ],
 
     'reply' => [
diff --git a/resources/lang/uk/beatmaps.php b/resources/lang/uk/beatmaps.php
index a9f473192c2..764f407d4ce 100644
--- a/resources/lang/uk/beatmaps.php
+++ b/resources/lang/uk/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Не вдається оновити голос',
diff --git a/resources/lang/uk/common.php b/resources/lang/uk/common.php
index 43e82719d7f..5520e81581d 100644
--- a/resources/lang/uk/common.php
+++ b/resources/lang/uk/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Адміністратор',
         'authorise' => 'Авторизація',
         'authorising' => 'Авторизація...',
+        'back' => '',
         'back_to_previous' => 'Повернутись до попереднього вигляду',
         'back_to_top' => 'На початок',
         'cancel' => 'Скасувати',
diff --git a/resources/lang/uk/follows.php b/resources/lang/uk/follows.php
index 12a847d6c1b..0fdddba466c 100644
--- a/resources/lang/uk/follows.php
+++ b/resources/lang/uk/follows.php
@@ -38,6 +38,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Досягнуто ліміт підписок.',
     ],
 ];
diff --git a/resources/lang/uk/forum.php b/resources/lang/uk/forum.php
index e9abc60b951..39a25093060 100644
--- a/resources/lang/uk/forum.php
+++ b/resources/lang/uk/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Дійсно відновити тему',
         'deleted' => 'видалена тема',
         'go_to_latest' => 'показати останню відповідь',
-        'go_to_unread' => '',
+        'go_to_unread' => 'переглянути перший непрочитаний допис',
         'has_replied' => 'Ви відповідали на цю тему',
         'in_forum' => 'в :forum',
         'latest_post' => ':when від :user',
diff --git a/resources/lang/uk/layout.php b/resources/lang/uk/layout.php
index 2189272ec1e..a5c7ada43df 100644
--- a/resources/lang/uk/layout.php
+++ b/resources/lang/uk/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Мій профіль',
             'scoring_mode_toggle' => 'Класична система очків',
             'scoring_mode_toggle_tooltip' => 'Підлаштувати очки так, щоб це відчувалось як класична необмежена система підрахунку',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/uk/multiplayer.php b/resources/lang/uk/multiplayer.php
index 5d1914dd1ba..2801033b65f 100644
--- a/resources/lang/uk/multiplayer.php
+++ b/resources/lang/uk/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Тривалість занадто довга.',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/uk/page_title.php b/resources/lang/uk/page_title.php
index 4a8bb7a6f5e..6a900d096e7 100644
--- a/resources/lang/uk/page_title.php
+++ b/resources/lang/uk/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => 'рейтинги',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'турніри',
         ],
diff --git a/resources/lang/uk/rankings.php b/resources/lang/uk/rankings.php
index 023021a6f25..9be7e6e3c43 100644
--- a/resources/lang/uk/rankings.php
+++ b/resources/lang/uk/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Складність',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Для досягнення топ 10%',
+        'top_50p' => 'Для досягнення топ 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/uk/teams.php b/resources/lang/uk/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/uk/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/vi/admin.php b/resources/lang/vi/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/vi/admin.php
+++ b/resources/lang/vi/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/vi/authorization.php b/resources/lang/vi/authorization.php
index 19c1f25ef70..78e30249eda 100644
--- a/resources/lang/vi/authorization.php
+++ b/resources/lang/vi/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => 'Bạn phải đạt điểm trên một beatmap để thêm thẻ.',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => 'Chỉ chủ phòng mới có thể đóng phòng.',
         ],
     ],
 
diff --git a/resources/lang/vi/beatmap_discussions.php b/resources/lang/vi/beatmap_discussions.php
index 1773177c1d7..03e0abe3be5 100644
--- a/resources/lang/vi/beatmap_discussions.php
+++ b/resources/lang/vi/beatmap_discussions.php
@@ -68,10 +68,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => 'Đang kiểm tra cập nhật...',
+        'has_updates' => 'Cuộc thảo luận có cập nhật, nhấn để làm mới.',
+        'no_updates' => 'Không có cập nhật mới.',
+        'updating' => 'Đang cập nhật...',
     ],
 
     'reply' => [
diff --git a/resources/lang/vi/beatmaps.php b/resources/lang/vi/beatmaps.php
index 9e0217afe27..8f0d3e8fb9d 100644
--- a/resources/lang/vi/beatmaps.php
+++ b/resources/lang/vi/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => 'Cập nhật phiếu thất bại',
diff --git a/resources/lang/vi/beatmapsets.php b/resources/lang/vi/beatmapsets.php
index ef66e00a5f1..d2359307eea 100644
--- a/resources/lang/vi/beatmapsets.php
+++ b/resources/lang/vi/beatmapsets.php
@@ -52,7 +52,7 @@
 
         'dialog' => [
             'confirmation' => 'Bạn có chắc chắn muốn đề cử beatmap này không?',
-            'different_nominator_warning' => '',
+            'different_nominator_warning' => 'Việc đủ điều kiện cho beatmap này với các người đề cử khác sẽ làm reset vị trí trong hàng đợi đủ điều kiện của nó.',
             'header' => 'Đề cử Beatmap',
             'hybrid_warning' => 'lưu ý: bạn chỉ có thể đề cử một lần, vì vậy hãy đảm bảo rằng bạn đang đề cử cho tất cả các chế độ chơi mà bạn dự định',
             'current_main_ruleset' => 'Ruleset chính hiện tại là: :ruleset',
diff --git a/resources/lang/vi/common.php b/resources/lang/vi/common.php
index 00b7f745e5a..64e5d304053 100644
--- a/resources/lang/vi/common.php
+++ b/resources/lang/vi/common.php
@@ -22,6 +22,7 @@
         'admin' => 'Admin',
         'authorise' => 'Cho phép',
         'authorising' => 'Cho phép...',
+        'back' => '',
         'back_to_previous' => 'Trở về vị trí trước',
         'back_to_top' => 'Quay lại đầu trang',
         'cancel' => 'Hủy',
diff --git a/resources/lang/vi/follows.php b/resources/lang/vi/follows.php
index 51b40e7af16..ada33ff0dbe 100644
--- a/resources/lang/vi/follows.php
+++ b/resources/lang/vi/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => 'Đã đạt giới hạn theo dõi.',
     ],
 ];
diff --git a/resources/lang/vi/forum.php b/resources/lang/vi/forum.php
index 6870285a974..f3a84365a58 100644
--- a/resources/lang/vi/forum.php
+++ b/resources/lang/vi/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => 'Bạn có muốn phục hồi bài viết này?',
         'deleted' => 'chủ đề đã xóa',
         'go_to_latest' => 'xem bài viết gần đây nhất',
-        'go_to_unread' => '',
+        'go_to_unread' => 'xem bài viết chưa đọc đầu tiên',
         'has_replied' => 'Bạn đã trả lời topic này',
         'in_forum' => 'trong :forum',
         'latest_post' => ':when bởi :user',
diff --git a/resources/lang/vi/layout.php b/resources/lang/vi/layout.php
index e38d560b710..e3fe66c81d9 100644
--- a/resources/lang/vi/layout.php
+++ b/resources/lang/vi/layout.php
@@ -201,6 +201,7 @@
             'profile' => 'Trang Cá Nhân',
             'scoring_mode_toggle' => 'Hệ thống điểm cổ điển',
             'scoring_mode_toggle_tooltip' => 'Thay đổi giá trị điểm để có cảm giác như hệ thống điểm cổ điển không giới hạn',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/vi/multiplayer.php b/resources/lang/vi/multiplayer.php
index 0d42c0c0d1c..993b1f709ce 100644
--- a/resources/lang/vi/multiplayer.php
+++ b/resources/lang/vi/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => 'Thời lượng quá dài. ',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/vi/page_title.php b/resources/lang/vi/page_title.php
index 6b0130a6323..cb339fe822b 100644
--- a/resources/lang/vi/page_title.php
+++ b/resources/lang/vi/page_title.php
@@ -108,6 +108,10 @@
         'seasons_controller' => [
             '_' => 'xếp hạng',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => 'giải đấu',
         ],
diff --git a/resources/lang/vi/rankings.php b/resources/lang/vi/rankings.php
index 43570ae077d..9435639192b 100644
--- a/resources/lang/vi/rankings.php
+++ b/resources/lang/vi/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => 'Độ khó',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => 'Điểm thuộc top 10%',
+        'top_50p' => 'Điểm thuộc top 50%',
     ],
 
     'filter' => [
diff --git a/resources/lang/vi/teams.php b/resources/lang/vi/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/vi/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/zh-tw/admin.php b/resources/lang/zh-tw/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/zh-tw/admin.php
+++ b/resources/lang/zh-tw/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/zh-tw/api.php b/resources/lang/zh-tw/api.php
index 74b62fa7764..d3abf7f9c12 100644
--- a/resources/lang/zh-tw/api.php
+++ b/resources/lang/zh-tw/api.php
@@ -17,7 +17,7 @@
         'identify' => '識別您的身分並閱讀您的公開個人資料。',
 
         'chat' => [
-            'read' => '以您的身分閲讀訊息。',
+            'read' => '以您的身分閱讀訊息。',
             'write' => '以你的身分傳送訊息。',
             'write_manage' => '以您的身分加入或離開頻道。',
         ],
diff --git a/resources/lang/zh-tw/authorization.php b/resources/lang/zh-tw/authorization.php
index e1340e66e97..5f3e2589f0d 100644
--- a/resources/lang/zh-tw/authorization.php
+++ b/resources/lang/zh-tw/authorization.php
@@ -7,7 +7,7 @@
     'play_more' => '不如馬上玩點 osu! 吧？',
     'require_login' => '登入以繼續。',
     'require_verification' => '驗證以繼續。',
-    'restricted' => "帳戶處於限制模式，無法進行該操作。",
+    'restricted' => "帳號處於限制模式，無法進行該操作。",
     'silenced' => "帳號被禁言，無法進行該操作。",
     'unauthorized' => '沒有權限。',
 
@@ -56,13 +56,13 @@
         'discussion_locked' => '這個圖譜被鎖定討論。',
 
         'metadata' => [
-            'nominated' => '你不能修改已提名的圖譜資訊。如果你認為有誤，請聯繫 BN 或 NAT 成員。',
+            'nominated' => '你不能修改已提名的圖譜資訊。如果你認為有誤，請聯絡 BN 或 NAT 成員。',
         ],
     ],
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => '您必須先在一個圖譜取得分數才能新增標籤。',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => '只有房間主人才能關閉。',
         ],
     ],
 
diff --git a/resources/lang/zh-tw/beatmap_discussions.php b/resources/lang/zh-tw/beatmap_discussions.php
index a217e5ba616..25345a7d8d6 100644
--- a/resources/lang/zh-tw/beatmap_discussions.php
+++ b/resources/lang/zh-tw/beatmap_discussions.php
@@ -33,9 +33,9 @@
             'beatmapset_status' => [
                 '_' => '圖譜狀態',
                 'all' => '全部',
-                'disqualified' => '取消資格',
-                'never_qualified' => '從未合格',
-                'qualified' => '合格',
+                'disqualified' => '取消提名',
+                'never_qualified' => '從未提名',
+                'qualified' => '提名',
                 'ranked' => '已進榜',
             ],
 
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => '檢查更新...',
+        'has_updates' => '此討論區有更新，點擊來重刷。',
+        'no_updates' => '沒有更新',
+        'updating' => '正在更新...',
     ],
 
     'reply' => [
diff --git a/resources/lang/zh-tw/beatmaps.php b/resources/lang/zh-tw/beatmaps.php
index 0213711f4ac..215e040b13e 100644
--- a/resources/lang/zh-tw/beatmaps.php
+++ b/resources/lang/zh-tw/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '投票更新失敗',
@@ -17,7 +21,7 @@
         'deleted' => '被 :editor 於 :delete_time 刪除。',
         'deny_kudosu' => '收回 kudosu',
         'edit' => '編輯',
-        'edited' => '最後由 :editor 編輯於 :update_time 。',
+        'edited' => '最後由 :editor 在 :update_time 編輯。',
         'guest' => '由 :user 製作的客串難度',
         'kudosu_denied' => 'kudosu 被收回',
         'message_placeholder_deleted_beatmap' => '該難度已被刪除，無法繼續討論',
@@ -96,7 +100,7 @@
             'events' => '歷史',
             'general' => '整體:scope',
             'reviews' => '評論',
-            'timeline' => '時間線',
+            'timeline' => '時間軸',
             'scopes' => [
                 'general' => '目前難度',
                 'generalAll' => '所有難度',
@@ -174,8 +178,8 @@
     'hype' => [
         'button' => '推薦圖譜！',
         'button_done' => '已經推薦！',
-        'confirm' => "你確定嗎？這將會使用你剩下的 :n 次推薦次數並且無法撤銷。",
-        'explanation' => '推薦這張圖譜讓它更容易被提名和進榜 ！',
+        'confirm' => "你確定嗎？這將會使用你剩下的 :n 次推薦次數並且無法取消。",
+        'explanation' => '推薦這張圖譜讓它更容易被提名和進榜！',
         'explanation_guest' => '登入並推薦這張圖譜，讓它更容易被提名並進榜！',
         'new_time' => "你將在 :new_time 後獲得新的推薦次數。",
         'remaining' => '你還可以推薦 :remaining 次。',
@@ -211,7 +215,7 @@
         'required_text' => '提名數：:current/:required',
         'reset_message_deleted' => '已刪除',
         'title' => '提名狀態',
-        'unresolved_issues' => '仍然有需解決的問題 。',
+        'unresolved_issues' => '請先處理圖譜中待解決的問題。',
 
         'rank_estimate' => [
             '_' => '如果沒有發現問題，這張圖譜預計會在 :date 進榜。它在 :queue 中排名第 #:position。',
@@ -297,7 +301,7 @@
         'mine' => '我的圖譜',
         'pending' => '待處理',
         'wip' => '尚未完工 (WIP)',
-        'qualified' => 'Qualified',
+        'qualified' => '提名',
         'ranked' => '已進榜',
     ],
     'genre' => [
@@ -319,10 +323,10 @@
     'language' => [
         'any' => '所有',
         'english' => '英文',
-        'chinese' => '中文',
+        'chinese' => '漢語',
         'french' => '法文',
         'german' => '德文',
-        'italian' => '意大利文',
+        'italian' => '義大利文',
         'japanese' => '日文',
         'korean' => '韓文',
         'spanish' => '西班牙文',
diff --git a/resources/lang/zh-tw/beatmapset_events.php b/resources/lang/zh-tw/beatmapset_events.php
index 5246ebcf75d..226522488ad 100644
--- a/resources/lang/zh-tw/beatmapset_events.php
+++ b/resources/lang/zh-tw/beatmapset_events.php
@@ -7,10 +7,10 @@
     'event' => [
         'approve' => '已批准。',
         'beatmap_owner_change' => '難度 :beatmap 的作者已變更為 :new_user。',
-        'discussion_delete' => '管理員刪除了 :discussion 。',
+        'discussion_delete' => '管理員刪除了 :discussion。',
         'discussion_lock' => '這張圖譜的討論已被停用。（:text）',
         'discussion_post_delete' => '管理員在 :discussion 中刪除了這則回覆。',
-        'discussion_post_restore' => '管理員在 :discussion 中恢復了這則回覆。',
+        'discussion_post_restore' => '版主已將 :discussion 中的貼文恢復。',
         'discussion_restore' => '管理員已恢復 :discussion 。',
         'discussion_unlock' => '這張圖譜的討論已被啟用。',
         'disqualify' => '這張圖譜因 :discussion（:text）被 :user 取消資格 (DQ)。',
@@ -18,9 +18,9 @@
         'genre_edit' => '曲風由 :old 變更為 :new。',
         'issue_reopen' => ':user 要求重審 :discussion_user 提出的問題 :discussion。',
         'issue_resolve' => ':user 已解決 :discussion_user 提出的問題 :discussion。',
-        'kudosu_allow' => '討論 :discussion 的 kudosu 移除操作已被重置。',
+        'kudosu_allow' => '討論串 :discussion 的 Kudosu 拒絕已被移除。',
         'kudosu_deny' => '討論 :discussion 所得的 kudosu 被移除。',
-        'kudosu_gain' => '討論 :discussion 獲得了足夠的票數而被給予 kudosu 。',
+        'kudosu_gain' => '討論 :discussion 獲得了足夠的票數而被給予 kudosu。',
         'kudosu_lost' => '討論 :discussion 失去了票數，並且所得 kudosu 已被移除。',
         'kudosu_recalculate' => '討論 :discussion 所得的 kudosu 已經重新計算。',
         'language_edit' => '語言從 :old 改為 :new。',
@@ -62,7 +62,7 @@
         'beatmap_owner_change' => '難度作者變更',
         'discussion_delete' => '刪除討論',
         'discussion_post_delete' => '刪除討論的回覆',
-        'discussion_post_restore' => '恢復已刪除的討論的回覆',
+        'discussion_post_restore' => '討論回覆恢復',
         'discussion_restore' => '恢復已刪除的討論',
         'disqualify' => 'Disqualification',
         'genre_edit' => '編輯曲風',
diff --git a/resources/lang/zh-tw/beatmapsets.php b/resources/lang/zh-tw/beatmapsets.php
index 3a9e5e17d95..718d12bf05d 100644
--- a/resources/lang/zh-tw/beatmapsets.php
+++ b/resources/lang/zh-tw/beatmapsets.php
@@ -158,7 +158,7 @@
 
             'buttons' => [
                 'disable' => '關閉警告',
-                'listing' => '圖譜列表',
+                'listing' => '圖譜清單',
                 'show' => '顯示',
             ],
         ],
@@ -191,7 +191,7 @@
                 'country' => '您的所在地玩家尚未上傳成績！',
                 'friend' => '您的好友尚未上傳成績！',
                 'global' => '沒有任何玩家上傳過成績，來挑戰嗎？',
-                'loading' => '加載分數中...',
+                'loading' => '正在載入分數...',
                 'unranked' => 'Unranked 譜面',
             ],
             'score' => [
@@ -205,7 +205,7 @@
         ],
 
         'stats' => [
-            'cs' => '縮圈大小',
+            'cs' => '圓圈大小',
             'cs-mania' => '鍵位數量',
             'drain' => '扣血速度',
             'accuracy' => '準確率',
@@ -219,7 +219,7 @@
             'user-rating' => '玩家評價',
             'rating-spread' => '評分情況',
             'nominations' => '提名',
-            'playcount' => '遊玩次数',
+            'playcount' => '遊玩次數',
         ],
 
         'status' => [
diff --git a/resources/lang/zh-tw/changelog.php b/resources/lang/zh-tw/changelog.php
index 98bde7a55c6..2ae0c7da5f1 100644
--- a/resources/lang/zh-tw/changelog.php
+++ b/resources/lang/zh-tw/changelog.php
@@ -11,7 +11,7 @@
     ],
 
     'builds' => [
-        'users_online' => ':count_delimited 名用戶上線',
+        'users_online' => ':count_delimited 位使用者在線上|:count_delimited 位使用者在線上',
     ],
 
     'entry' => [
diff --git a/resources/lang/zh-tw/common.php b/resources/lang/zh-tw/common.php
index 5765a803024..19f666ce609 100644
--- a/resources/lang/zh-tw/common.php
+++ b/resources/lang/zh-tw/common.php
@@ -5,7 +5,7 @@
 
 return [
     'confirmation' => '確定？',
-    'confirmation_unsaved' => '未被修改的將不會保存。你確定嗎？',
+    'confirmation_unsaved' => '未儲存的變更將會遺失。您確定嗎？',
     'saved' => '已儲存',
 
     'array_and' => [
@@ -22,6 +22,7 @@
         'admin' => '管理員',
         'authorise' => '授權',
         'authorising' => '授權中',
+        'back' => '',
         'back_to_previous' => '返回到上一個位置',
         'back_to_top' => '返回頂部',
         'cancel' => '取消',
@@ -39,9 +40,9 @@
         'pin' => '置頂',
         'post' => '發表',
         'read_more' => '查看詳情',
-        'refresh' => '刷新',
+        'refresh' => '重新整理',
         'reply' => '回覆',
-        'reply_reopen' => '回覆並重新打開',
+        'reply_reopen' => '回覆並重新開啟',
         'reply_resolve' => '回覆並標記為已解決',
         'reset' => '重設',
         'restore' => '復原',
@@ -110,7 +111,7 @@
     ],
 
     'dropzone' => [
-        'target' => '拉到此處以上傳',
+        'target' => '拖曳至此以上傳',
     ],
 
     'input' => [
@@ -158,7 +159,7 @@
     ],
 
     'wrong_user' => [
-        '_' => '您已以 :user 的身分登入。 :logout_link',
-        'logout_link' => '點擊此處以不同帳號登入。',
+        '_' => '您已登入為 :user。:logout_link。',
+        'logout_link' => '按這裡以不同帳號登入。',
     ],
 ];
diff --git a/resources/lang/zh-tw/community.php b/resources/lang/zh-tw/community.php
index 376ff64b64e..ef77aeae894 100644
--- a/resources/lang/zh-tw/community.php
+++ b/resources/lang/zh-tw/community.php
@@ -8,11 +8,11 @@
         'convinced' => [
             'title' => '可以可以，買買買！',
             'support' => '贊助 osu!',
-            'gift' => '或者以禮物方式贈送給其它玩家',
+            'gift' => '或者以禮物方式贈送給其他玩家',
             'instructions' => '點擊愛心前往 osu! 商店',
         ],
         'why-support' => [
-            'title' => '我為什麼要贊助 osu! ？錢都花到哪兒了？',
+            'title' => '我為什麼要贊助 osu!？錢都花到哪裡了？',
 
             'team' => [
                 'title' => '資助團隊',
@@ -20,12 +20,12 @@
             ],
             'infra' => [
                 'title' => '伺服器基礎設施',
-                'description' => '捐款用於網站營運，多人連線服務，在線排行榜...等等。',
+                'description' => '捐款將用於網站伺服器營運、多人遊戲服務、線上排行榜等。',
             ],
             'featured-artists' => [
                 'title' => '精選藝術家',
                 'description' => '在你的支持下，我們可以與更多優秀的藝術家合作，並為 osu! 帶來更多出色的音樂',
-                'link_text' => '查看當前列表 &raquo;',
+                'link_text' => '查看目前清單 &raquo;',
             ],
             'ads' => [
                 'title' => '維持 osu! 自給自足',
@@ -33,7 +33,7 @@
             ],
             'tournaments' => [
                 'title' => '官方比賽',
-                'description' => '為官方 osu! 世界杯籌備營運資金（及獎勵）。',
+                'description' => '為官方 osu! 世界盃籌備營運資金（及獎勵）。',
                 'link_text' => '探索比賽 &raquo;',
             ],
             'bounty-program' => [
@@ -90,8 +90,8 @@
             ],
 
             'yellow_fellow' => [
-                'title' => '高亮使用者名稱',
-                'description' => '聊天時，用戶名會變成亮黃色。',
+                'title' => '突顯使用者名稱',
+                'description' => '聊天時，使用者名稱會變成亮黃色。',
             ],
 
             'speedy_downloads' => [
@@ -100,8 +100,8 @@
             ],
 
             'change_username' => [
-                'title' => '修改用戶名',
-                'description' => '修改用戶名而不需要支付費用（最多 1 次）。',
+                'title' => '修改使用者名稱',
+                'description' => '修改使用者名稱而不需要支付費用（最多 1 次）。',
             ],
 
             'skinnables' => [
@@ -139,7 +139,7 @@
         ],
         'supporter_status' => [
             'contribution' => '感謝您一直以來的支持！您已經捐贈了 :dollars 並購買了 :tags 次贊助者標籤！',
-            'gifted' => "您已經捐贈了 :giftedTags 次贊助者標籤（花費了 :giftedDollars ），真慷慨啊！",
+            'gifted' => "您已經捐贈了 :giftedTags 次贊助者標籤（花費了 :giftedDollars），真慷慨啊！",
             'not_yet' => "您還沒有贊助者標籤 :(",
             'valid_until' => '您的贊助者標籤將在 :date 到期',
             'was_valid_until' => '您的贊助者標籤已於 :date 到期',
diff --git a/resources/lang/zh-tw/contest.php b/resources/lang/zh-tw/contest.php
index 968b778031d..d92cb6c8b4e 100644
--- a/resources/lang/zh-tw/contest.php
+++ b/resources/lang/zh-tw/contest.php
@@ -34,7 +34,7 @@
     ],
 
     'voting' => [
-        'judge_link' => '您是此競賽的評委。請在此處評分。',
+        'judge_link' => '您是此競賽的評委。請在這裡評分。',
         'judged_notice' => '本競賽使用評分系統，評委正在進行評分。',
         'login_required' => '請登入後再投票。',
         'over' => '這場評選的投票已經結束',
@@ -64,19 +64,19 @@
     'entry' => [
         '_' => '參加',
         'login_required' => '請登入後再參加評選。',
-        'silenced_or_restricted' => '帳戶受限時無法參加評選。',
+        'silenced_or_restricted' => '帳號受限時無法參加評選。',
         'preparation' => '我們正在準備這場評選，請耐心等待！',
-        'drop_here' => '將您的參賽文件拖到此處',
+        'drop_here' => '將您的參賽檔案拖曳至此',
         'download' => '下載 .osz 檔案',
 
         'wrong_type' => [
             'art' => '只接受 .jpg 和 .png 格式的檔案。',
-            'beatmap' => '只接受 .osu 格式的文件.',
-            'music' => '只接受 .mp3 格式的文件.',
+            'beatmap' => '只接受 .osu 格式的檔案。',
+            'music' => '只接受 .mp3 格式的檔案。',
         ],
 
         'wrong_dimensions' => '參加競賽的數量必須達到 :widthx:height',
-        'too_big' => '參賽文件的大小不能超過 :limit.',
+        'too_big' => '參賽檔案的大小不能超過 :limit。',
     ],
 
     'beatmaps' => [
diff --git a/resources/lang/zh-tw/errors.php b/resources/lang/zh-tw/errors.php
index 2b0e0cbe33c..ebc270261df 100644
--- a/resources/lang/zh-tw/errors.php
+++ b/resources/lang/zh-tw/errors.php
@@ -4,10 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
-    'load_failed' => '無法載入數據。',
+    'load_failed' => '無法載入資料。',
     'missing_route' => '網址或請求方法錯誤。',
     'no_restricted_access' => '由於您的帳號已受限，故無法執行該操作。',
-    'supporter_only' => '您需要成為 osu!贊助者才能使用此功能 。',
+    'supporter_only' => '您需要成為 osu! 贊助者才能使用此功能。',
     'unknown' => '發生了未知的錯誤。',
 
     'codes' => [
@@ -34,9 +34,9 @@
     'search' => [
         'default' => '無法獲得任何結果，請稍後再試。',
         'invalid_cursor_exception' => '指定的游標參數無效。',
-        'operation_timeout_exception' => '搜索目前比平常更繁忙，稍後再試。',
+        'operation_timeout_exception' => '搜尋功能目前使用量較大，請稍後再試。',
     ],
     'user_report' => [
-        'recently_reported' => "你已經舉報過了。",
+        'recently_reported' => "你已經檢舉過了。",
     ],
 ];
diff --git a/resources/lang/zh-tw/events.php b/resources/lang/zh-tw/events.php
index 20326f2cee8..77fc34e9b33 100644
--- a/resources/lang/zh-tw/events.php
+++ b/resources/lang/zh-tw/events.php
@@ -6,12 +6,12 @@
 return [
     'achievement' => '<strong><em>:user</em></strong> 解鎖了 "<strong>:achievement</strong>" 成就！',
     'beatmap_playcount' => ':beatmap 已經被玩了 :count 次！',
-    'beatmapset_approve' => '<strong>:user</strong> 製作的 :beatmapset 已經被 :approval ！',
+    'beatmapset_approve' => '<strong>:user</strong> 製作的 :beatmapset 已經被 :approval！',
     'beatmapset_delete' => ':beatmapset 已經被刪除。',
     'beatmapset_revive' => ':beatmapset 已經被 <strong>:user</strong> 恢復。',
     'beatmapset_update' => '<strong><em>:user</em></strong> 更新了圖譜 "<em>:beatmapset</em>"',
     'beatmapset_upload' => '<strong><em>:user</em></strong> 提交了一個新圖譜 ":beatmapset"',
-    'empty' => "該用戶最近沒有活動！",
+    'empty' => "該使用者最近沒有活動！",
     'rank' => '<strong><em>:user</em></strong> 在 <em>:beatmap</em> （:mode）中取得第 :rank 名',
     'rank_lost' => '<strong><em>:user</em></strong> 失去了 <em>:beatmap</em> （:mode）的第一名',
     'user_support_again' => '<strong>:user</strong> 又一次支持了 osu! - 感謝您的慷慨捐贈！',
@@ -20,10 +20,10 @@
     'username_change' => '<strong>:previousUsername</strong> 將使用者名稱改為 <strong><em>:user</em></strong>！',
 
     'beatmapset_status' => [
-        'approved' => '已核准',
+        'approved' => '核准',
         'loved' => 'loved',
-        'qualified' => '已核可',
-        'ranked' => '已進榜',
+        'qualified' => '給與上架資格',
+        'ranked' => '列為正式上架',
     ],
 
     'value' => [
diff --git a/resources/lang/zh-tw/follows.php b/resources/lang/zh-tw/follows.php
index 7344d009e05..0f13b3d6621 100644
--- a/resources/lang/zh-tw/follows.php
+++ b/resources/lang/zh-tw/follows.php
@@ -27,7 +27,7 @@
         'empty' => '沒有正在關注的譜師。',
         'followers' => '作圖追蹤者',
         'page_title' => '關注的譜師',
-        'title' => '作圖者',
+        'title' => '譜師',
         'to_0' => '停止通知我這個用戶上傳新的圖譜',
         'to_1' => '當這個用戶上傳新的圖譜時通知我',
     ],
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => '已到達追蹤限制',
     ],
 ];
diff --git a/resources/lang/zh-tw/forum.php b/resources/lang/zh-tw/forum.php
index 64930197e6e..9c7e1e1e303 100644
--- a/resources/lang/zh-tw/forum.php
+++ b/resources/lang/zh-tw/forum.php
@@ -15,7 +15,7 @@
         'create' => [
             '_' => '新增封面',
             'button' => '上傳圖片',
-            'info' => '圖片尺寸應為 :dimensions。你也可以將圖片拉到此處來上傳。',
+            'info' => '封面大小應為 :dimensions。您也可以將圖片拖曳至此以上傳。',
         ],
 
         'destroy' => [
@@ -29,7 +29,7 @@
         'latest_post' => '最新貼文',
 
         'index' => [
-            'title' => '論壇主頁',
+            'title' => '論壇索引',
         ],
 
         'topics' => [
@@ -45,7 +45,7 @@
 
     'post' => [
         'confirm_destroy' => '刪除此回覆？',
-        'confirm_restore' => '恢復此回覆？',
+        'confirm_restore' => '確定要恢復這篇貼文嗎？',
         'edited' => '最後由 :user 於 :when 編輯，總共編輯了 :count 次。',
         'posted_at' => '發表於 :when',
         'posted_by_in' => ':username 在 ":forum" 中發布了貼文',
@@ -80,7 +80,9 @@
         'confirm_restore' => '確定要復原這個主題嗎？',
         'deleted' => '已刪除的主題',
         'go_to_latest' => '查看最後的貼文',
-        'go_to_unread' => '',
+        'go_to_unread' => '查看第一篇未讀帖子
+
+',
         'has_replied' => '您已回覆此主題',
         'in_forum' => '目前看板[ :forum ]',
         'latest_post' => ':when :user',
@@ -90,7 +92,7 @@
         'post_reply' => '發表',
         'reply_box_placeholder' => '輸入回覆',
         'reply_title_prefix' => 'Re',
-        'started_by' => '發表人： :user',
+        'started_by' => '發文者：:user',
         'started_by_verbose' => '由 :user 發起',
 
         'actions' => [
@@ -117,12 +119,12 @@
 
             'placeholder' => [
                 'body' => '在這裡輸入內文',
-                'title' => '點擊這裡編輯標題',
+                'title' => '按這裡編輯標題',
             ],
         ],
 
         'jump' => [
-            'enter' => '點擊這裡跳轉到指定的回覆',
+            'enter' => '按這裡跳至指定的貼文編號',
             'first' => '返回頂部',
             'last' => '跳至最後',
             'next' => '往後 10 篇',
@@ -166,7 +168,7 @@
                 'pin' => '已置頂主題',
                 'post_edited' => '已編輯貼文',
                 'restore_post' => '已回復貼文',
-                'restore_topic' => '已回復主題',
+                'restore_topic' => '已恢復主題',
                 'split_destination' => '已移動分割的貼文',
                 'split_source' => '已分割貼文',
                 'topic_type' => '已設定主題類型',
diff --git a/resources/lang/zh-tw/layout.php b/resources/lang/zh-tw/layout.php
index 2b76c7d6b0a..247026c9f25 100644
--- a/resources/lang/zh-tw/layout.php
+++ b/resources/lang/zh-tw/layout.php
@@ -97,7 +97,7 @@
             '_' => '網站地圖',
             'home' => '首頁',
             'changelog-index' => '更新日誌',
-            'beatmaps' => '圖譜列表',
+            'beatmaps' => '圖譜清單',
             'download' => '下載 osu!',
         ],
         'help' => [
@@ -201,6 +201,7 @@
             'profile' => '我的資料',
             'scoring_mode_toggle' => 'Classic 計分',
             'scoring_mode_toggle_tooltip' => '將分數調整至像是 classic 不封頂的的計分',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/zh-tw/mail.php b/resources/lang/zh-tw/mail.php
index de3cd83abf8..4f1762a4df9 100644
--- a/resources/lang/zh-tw/mail.php
+++ b/resources/lang/zh-tw/mail.php
@@ -7,7 +7,7 @@
     'beatmapset_update_notice' => [
         'new' => '只是讓您知道自從您上次訪問以來，圖譜「:title」中有了新的更新。',
         'subject' => '圖譜“:title”有更新',
-        'unwatch' => '如果您不想再關注這張圖譜的話，可以點擊 “取消關注” 鏈接在頁面的下方，或者在摸圖關注頁面中：',
+        'unwatch' => '如果您不想再關注這張圖譜的話，可以點擊 “取消關注” 連結在頁面的下方，或者在摸圖關注頁面中：',
         'visit' => '訪問這裡的討論頁面：',
     ],
 
@@ -20,7 +20,7 @@
 
     'donation_thanks' => [
         'benefit_more' => '將來還會有更多贊助者獨享的功能!',
-        'feedback' => "如果您有任何問題或建議，請直接回覆這封郵件。我會盡快回復的！",
+        'feedback' => "如果您有任何問題或建議，請直接回覆這封郵件。我會盡快回覆的！",
         'keep_free' => '多虧了像您這樣的人，讓 osu! 能夠在沒有任何廣告或強制付費的情況下保持遊戲和社群的順利運行。',
         'keep_running' => '您的支持可讓 osu! 持續執行大概 :minutes！雖然看起來沒有太多，但有大家的支持會更長久 :)。',
         'subject' => '非常感謝，osu! 愛你哦~',
@@ -41,7 +41,7 @@
     'forum_new_reply' => [
         'new' => '只是讓您知道自從您上次訪問以來，「:title」中有了新的更新。',
         'subject' => '[osu!] 主題 ":title" 有新回覆',
-        'unwatch' => '如果您不想再關注本話題，您可以點擊主題頁下面的¨取消關注該主題¨鏈接，或者從訂閱管理頁面中取消訂閱。',
+        'unwatch' => '如果您不想再關注本話題，您可以點擊主題頁下面的¨取消關注該主題¨連結，或者從訂閱管理頁面中取消訂閱。',
         'visit' => '使用以下連結跳到最新回覆：',
     ],
 
@@ -79,7 +79,7 @@
     ],
 
     'user_force_reactivation' => [
-        'main' => '由於近期您的帳號有可疑的行爲或者使用了太弱的密碼，已被暫時停用。因此我們需要您設定一個新的密碼。請確保使用足夠強的密碼。',
+        'main' => '由於近期您的帳號有可疑的行為或者使用了強度較弱的密碼，目前已被暫時停用。因此我們需要您設定一個新的密碼。請確保使用強度較強的密碼。',
         'perform_reset' => '您可以點擊此連結來重設密碼:url',
         'reason' => '原因:',
         'subject' => '您需要重新驗證您的 osu! 帳戶',
diff --git a/resources/lang/zh-tw/model_validation.php b/resources/lang/zh-tw/model_validation.php
index fa7a467777d..3c41e720e8f 100644
--- a/resources/lang/zh-tw/model_validation.php
+++ b/resources/lang/zh-tw/model_validation.php
@@ -9,10 +9,10 @@
     'required' => '需要 :attribute 。',
     'too_long' => ':attribute 超出最大長度——最多允許 :limit 個字符。',
     'url' => '請輸入一個正確無誤的網址。',
-    'wrong_confirmation' => '確認信息不匹配。',
+    'wrong_confirmation' => '確認資訊不符。',
 
     'beatmapset_discussion' => [
-        'beatmap_missing' => '指定了時間戳但是譜面不存在。',
+        'beatmap_missing' => '指定了時間戳記但是譜面不存在。',
         'beatmapset_no_hype' => "無法推薦譜面。",
         'hype_requires_null_beatmap' => '只能在 常規（全難度） 中推薦。',
         'invalid_beatmap_id' => '指定的難度無效。',
@@ -21,26 +21,26 @@
 
         'attributes' => [
             'message_type' => '訊息類型',
-            'timestamp' => '時間戳',
+            'timestamp' => '時間戳記',
         ],
 
         'hype' => [
             'discussion_locked' => "該圖譜目前為鎖定討論狀態，無法被推薦",
-            'guest' => '登錄後才能推薦',
+            'guest' => '必須登入後才能推薦',
             'hyped' => '你已經推薦了這張譜面',
-            'limit_exceeded' => '你已經用光了推薦次數',
+            'limit_exceeded' => '你已經用完推薦次數',
             'not_hypeable' => '這張譜面無法推薦',
             'owner' => '不能推薦你自己的譜面',
         ],
 
         'timestamp' => [
-            'exceeds_beatmapset_length' => '指定的時間戳不在譜面範圍內。',
-            'negative' => "無法定位時間戳。",
+            'exceeds_beatmapset_length' => '指定的時間戳記不在譜面範圍內。',
+            'negative' => "無法定位時間戳記。",
         ],
     ],
 
     'beatmapset_discussion_post' => [
-        'discussion_locked' => '討論被鎖定。',
+        'discussion_locked' => '討論已被鎖定。',
         'first_post' => '無法刪除第一個討論。',
 
         'attributes' => [
@@ -164,7 +164,7 @@
         ],
 
         'change_username' => [
-            'restricted' => '帳戶處於限制模式時無法更變使用者名稱。',
+            'restricted' => '帳戶處於限制模式時無法變更使用者名稱。',
             'supporter_required' => [
                 '_' => '你必須 :link 才能更改用戶名！',
                 'link_text' => '支持 osu!',
diff --git a/resources/lang/zh-tw/multiplayer.php b/resources/lang/zh-tw/multiplayer.php
index cb40b2880aa..14805aeb971 100644
--- a/resources/lang/zh-tw/multiplayer.php
+++ b/resources/lang/zh-tw/multiplayer.php
@@ -7,7 +7,7 @@
     'empty' => [
         '_' => '尚未遊玩 osu!(lazer) :type_group 遊戲！',
         'playlists' => '歌單',
-        'realtime' => '多人',
+        'realtime' => '多人遊戲',
     ],
 
     'room' => [
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '持續時間過長。',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/zh-tw/notifications.php b/resources/lang/zh-tw/notifications.php
index 15e0173d4a7..06dc73bd596 100644
--- a/resources/lang/zh-tw/notifications.php
+++ b/resources/lang/zh-tw/notifications.php
@@ -79,7 +79,7 @@
                 'beatmapset_love_compact' => '圖譜被提升為 loved',
                 'beatmapset_nominate' => '「:title」已被提名',
                 'beatmapset_nominate_compact' => '圖譜已被提名',
-                'beatmapset_qualify' => '「:title」已獲得足夠提名并因此進入了上架列隊',
+                'beatmapset_qualify' => '「:title」已獲得足夠的提名，因此進入了上架隊列',
                 'beatmapset_qualify_compact' => '圖譜已進入上架列隊',
                 'beatmapset_rank' => '「:title」已進榜',
                 'beatmapset_rank_compact' => '圖譜已進榜',
diff --git a/resources/lang/zh-tw/page_title.php b/resources/lang/zh-tw/page_title.php
index 6a47e7aac45..16e593f5aa8 100644
--- a/resources/lang/zh-tw/page_title.php
+++ b/resources/lang/zh-tw/page_title.php
@@ -51,7 +51,7 @@
         ],
         'beatmapsets_controller' => [
             'discussion' => '圖譜討論',
-            'index' => '圖譜列表',
+            'index' => '圖譜清單',
             'show' => '圖譜資訊',
         ],
         'changelog_controller' => [
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '排行榜',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '官方比賽',
         ],
diff --git a/resources/lang/zh-tw/rankings.php b/resources/lang/zh-tw/rankings.php
index b0cfc0c9f0d..404c0ad1e17 100644
--- a/resources/lang/zh-tw/rankings.php
+++ b/resources/lang/zh-tw/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => '難度',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => '前 10%的分數',
+        'top_50p' => '前 50%的分數',
     ],
 
     'filter' => [
diff --git a/resources/lang/zh-tw/report.php b/resources/lang/zh-tw/report.php
index 7ecf6a943df..36586c04a7a 100644
--- a/resources/lang/zh-tw/report.php
+++ b/resources/lang/zh-tw/report.php
@@ -25,8 +25,8 @@
     ],
 
     'message' => [
-        'button' => '舉報訊息',
-        'title' => '舉報 :username 的訊息？',
+        'button' => '檢舉訊息',
+        'title' => '要檢舉 :username 的訊息嗎？',
     ],
 
     'scores' => [
diff --git a/resources/lang/zh-tw/sessions.php b/resources/lang/zh-tw/sessions.php
index 5bab757c229..08e37e3e6ae 100644
--- a/resources/lang/zh-tw/sessions.php
+++ b/resources/lang/zh-tw/sessions.php
@@ -5,7 +5,7 @@
 
 return [
     'create' => [
-        'download' => '點擊這裡來下載遊戲並新增帳號',
+        'download' => '按這裡來下載遊戲並新增帳號',
         'label' => '首先，讓我們登入你的帳號吧!',
         'title' => '帳號登入',
     ],
diff --git a/resources/lang/zh-tw/store.php b/resources/lang/zh-tw/store.php
index af26d0f5ca7..34ece4d93bd 100644
--- a/resources/lang/zh-tw/store.php
+++ b/resources/lang/zh-tw/store.php
@@ -86,7 +86,7 @@
                 'line_1' => '如果您已經付款，我們可能還在等待收到您付款的確認。請在一兩分鐘內重新載入此頁面！',
                 'line_2' => [
                     '_' => '如果您在結帳時遇到問題，請查看 :link',
-                    'link_text' => '點擊這裡繼續您的結帳',
+                    'link_text' => '按這裡繼續您的結帳',
                 ],
             ],
             'shipped' => [
diff --git a/resources/lang/zh-tw/teams.php b/resources/lang/zh-tw/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/zh-tw/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/lang/zh-tw/user_verification.php b/resources/lang/zh-tw/user_verification.php
index 57267ede0b4..69dc2fe2bd9 100644
--- a/resources/lang/zh-tw/user_verification.php
+++ b/resources/lang/zh-tw/user_verification.php
@@ -13,7 +13,7 @@
         'info' => [
             'check_spam' => "如果找不到電子郵件，請檢查垃圾郵件箱。",
             'recover' => "如果您無法登入電子郵件或忘記電子郵件, 請點選 :link。",
-            'recover_link' => '電子郵件復原點擊此處',
+            'recover_link' => '由此找回電子郵件',
             'reissue' => '也可以 :reissue_link 或者 :logout_link.',
             'reissue_link' => '重發驗證碼',
             'logout_link' => '登出',
diff --git a/resources/lang/zh-tw/users.php b/resources/lang/zh-tw/users.php
index 23bcfbd3217..efb7b002908 100644
--- a/resources/lang/zh-tw/users.php
+++ b/resources/lang/zh-tw/users.php
@@ -151,7 +151,7 @@
         'comments' => '補充評論',
         'placeholder' => '請提供任何您覺得有用的資訊。',
         'reason' => '原因',
-        'thanks' => '感謝您的舉報！',
+        'thanks' => '感謝您的檢舉！',
         'title' => '檢舉 :username?',
 
         'actions' => [
@@ -224,7 +224,7 @@
                     'broken_file' => '上傳失敗。請檢查上傳的圖片並重試.',
                     'button' => '上傳圖片',
                     'dropzone' => '拖動到此處以上傳',
-                    'dropzone_info' => '您也可以將圖片拉到此處上傳',
+                    'dropzone_info' => '您也可以將圖片拖曳至此以上傳',
                     'size_info' => '圖片尺寸應為2400x620',
                     'too_large' => '上傳的圖片檔案過大.',
                     'unsupported_format' => '不支援的檔案格式.',
diff --git a/resources/lang/zh-tw/wiki.php b/resources/lang/zh-tw/wiki.php
index 6c1be9dff9b..36ce0ba7511 100644
--- a/resources/lang/zh-tw/wiki.php
+++ b/resources/lang/zh-tw/wiki.php
@@ -12,7 +12,7 @@
         'missing_translation' => '請求的頁面沒有當前語言的版本。',
         'needs_cleanup_or_rewrite' => '該頁面並沒有達到 osu! wiki 的標準並需要整理或者修正。如果您可以幫助修正，請考慮更新這篇文章！',
         'search' => '在 wiki 中搜索 :link 。',
-        'stub' => '這篇文章尚未完成，正在等待擴充。',
+        'stub' => '這篇文章尚未完成，正在等待補充。',
         'toc' => '目錄',
 
         'edit' => [
diff --git a/resources/lang/zh/admin.php b/resources/lang/zh/admin.php
index 24dc9c8531b..4988124fa8c 100644
--- a/resources/lang/zh/admin.php
+++ b/resources/lang/zh/admin.php
@@ -53,6 +53,11 @@
                 'beatmapsets' => '',
                 'forum' => '',
                 'general' => '',
+
+                'users' => [
+                    'header' => '',
+                    'cover_presets' => '',
+                ],
             ],
         ],
     ],
diff --git a/resources/lang/zh/authorization.php b/resources/lang/zh/authorization.php
index 4b4b024aff2..7e958d9f811 100644
--- a/resources/lang/zh/authorization.php
+++ b/resources/lang/zh/authorization.php
@@ -62,7 +62,7 @@
 
     'beatmap_tag' => [
         'store' => [
-            'no_score' => '',
+            'no_score' => '要添加标签，必须先在谱面内留下成绩。',
         ],
     ],
 
@@ -178,7 +178,7 @@
 
     'room' => [
         'destroy' => [
-            'not_owner' => '',
+            'not_owner' => '只有房主可以关闭它。',
         ],
     ],
 
diff --git a/resources/lang/zh/beatmap_discussions.php b/resources/lang/zh/beatmap_discussions.php
index 0db3b7b6bd1..997fd4a1682 100644
--- a/resources/lang/zh/beatmap_discussions.php
+++ b/resources/lang/zh/beatmap_discussions.php
@@ -67,10 +67,10 @@
     ],
 
     'refresh' => [
-        'checking' => '',
-        'has_updates' => '',
-        'no_updates' => '',
-        'updating' => '',
+        'checking' => '正在检查更新......',
+        'has_updates' => '讨论有更新，点击刷新。',
+        'no_updates' => '没有更新。',
+        'updating' => '更新中...',
     ],
 
     'reply' => [
diff --git a/resources/lang/zh/beatmaps.php b/resources/lang/zh/beatmaps.php
index ed8b0dac1c3..577e4f21ee1 100644
--- a/resources/lang/zh/beatmaps.php
+++ b/resources/lang/zh/beatmaps.php
@@ -4,6 +4,10 @@
 // See the LICENCE file in the repository root for full licence text.
 
 return [
+    'change_owner' => [
+        'too_many' => '',
+    ],
+
     'discussion-votes' => [
         'update' => [
             'error' => '更新投票失败',
diff --git a/resources/lang/zh/common.php b/resources/lang/zh/common.php
index 6f9368edf57..8ee44049b8f 100644
--- a/resources/lang/zh/common.php
+++ b/resources/lang/zh/common.php
@@ -22,6 +22,7 @@
         'admin' => '管理员',
         'authorise' => '授权',
         'authorising' => '授权中……',
+        'back' => '',
         'back_to_previous' => '返回上一位置',
         'back_to_top' => '回到顶部',
         'cancel' => '取消',
diff --git a/resources/lang/zh/follows.php b/resources/lang/zh/follows.php
index d39f82319e1..13a6c83ae86 100644
--- a/resources/lang/zh/follows.php
+++ b/resources/lang/zh/follows.php
@@ -37,6 +37,6 @@
     ],
 
     'store' => [
-        'too_many' => '',
+        'too_many' => '关注数量达到最大限制。',
     ],
 ];
diff --git a/resources/lang/zh/forum.php b/resources/lang/zh/forum.php
index 16622f25666..1b8c0c44677 100644
--- a/resources/lang/zh/forum.php
+++ b/resources/lang/zh/forum.php
@@ -80,7 +80,7 @@
         'confirm_restore' => '恢复此主题？',
         'deleted' => '已删除的主题',
         'go_to_latest' => '查看最新的帖子',
-        'go_to_unread' => '',
+        'go_to_unread' => '查看第一条未读贴',
         'has_replied' => '你已回复过此主题',
         'in_forum' => '在 :forum',
         'latest_post' => ':when :user',
diff --git a/resources/lang/zh/layout.php b/resources/lang/zh/layout.php
index e325ded0c9b..7a51b41f0b5 100644
--- a/resources/lang/zh/layout.php
+++ b/resources/lang/zh/layout.php
@@ -201,6 +201,7 @@
             'profile' => '资料',
             'scoring_mode_toggle' => '经典计分',
             'scoring_mode_toggle_tooltip' => '调整分数，让它感觉上更像经典的无上限计分分数。',
+            'team' => '',
         ],
     ],
 
diff --git a/resources/lang/zh/multiplayer.php b/resources/lang/zh/multiplayer.php
index a68d9c32e4c..d4c544b886c 100644
--- a/resources/lang/zh/multiplayer.php
+++ b/resources/lang/zh/multiplayer.php
@@ -19,6 +19,7 @@
 
         'errors' => [
             'duration_too_long' => '持续时间过长。',
+            'name_too_long' => '',
         ],
 
         'status' => [
diff --git a/resources/lang/zh/page_title.php b/resources/lang/zh/page_title.php
index 710494c60a3..9e09b692a98 100644
--- a/resources/lang/zh/page_title.php
+++ b/resources/lang/zh/page_title.php
@@ -107,6 +107,10 @@
         'seasons_controller' => [
             '_' => '排名',
         ],
+        'teams_controller' => [
+            '_' => '',
+            'show' => '',
+        ],
         'tournaments_controller' => [
             '_' => '比赛',
         ],
diff --git a/resources/lang/zh/rankings.php b/resources/lang/zh/rankings.php
index fee1b0abb43..faca32fc6dd 100644
--- a/resources/lang/zh/rankings.php
+++ b/resources/lang/zh/rankings.php
@@ -11,8 +11,8 @@
 
     'daily_challenge' => [
         'beatmap' => '难度',
-        'top_10p' => '',
-        'top_50p' => '',
+        'top_10p' => '前 10% 成绩',
+        'top_50p' => '前 50% 成绩',
     ],
 
     'filter' => [
diff --git a/resources/lang/zh/teams.php b/resources/lang/zh/teams.php
new file mode 100644
index 00000000000..9f08f97f0d6
--- /dev/null
+++ b/resources/lang/zh/teams.php
@@ -0,0 +1,82 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+return [
+    'edit' => [
+        'saved' => '',
+        'title' => '',
+
+        'description' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'header' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'logo' => [
+            'label' => '',
+            'title' => '',
+        ],
+
+        'settings' => [
+            'application' => '',
+            'application_help' => '',
+            'default_ruleset' => '',
+            'default_ruleset_help' => '',
+            'title' => '',
+            'url' => '',
+
+            'application_state' => [
+                'state_0' => '',
+                'state_1' => '',
+            ],
+        ],
+    ],
+
+    'members' => [
+        'destroy' => [
+            'success' => '',
+        ],
+
+        'index' => [
+            'title' => '',
+
+            'table' => [
+                'status' => '',
+                'joined_at' => '',
+                'remove' => '',
+                'title' => '',
+            ],
+
+            'status' => [
+                'status_0' => '',
+                'status_1' => '',
+            ],
+        ],
+    ],
+    'show' => [
+        'bar' => [
+            'settings' => '',
+        ],
+
+        'info' => [
+            'created' => '',
+            'website' => '',
+        ],
+
+        'members' => [
+            'members' => '',
+            'owner' => '',
+        ],
+
+        'sections' => [
+            'members' => '',
+            'info' => '',
+        ],
+    ],
+];
diff --git a/resources/views/admin/contests/show.blade.php b/resources/views/admin/contests/show.blade.php
index ab632c9271f..f3948a9feea 100644
--- a/resources/views/admin/contests/show.blade.php
+++ b/resources/views/admin/contests/show.blade.php
@@ -39,6 +39,7 @@
                 <form
                     action="{{ route('admin.contests.get-zip', $contest->id) }}"
                     data-loading-overlay="0"
+                    data-turbo="false"
                     method="POST"
                 >
                     @csrf
diff --git a/resources/views/follows/modding.blade.php b/resources/views/follows/modding.blade.php
index 18f677dec3b..210c646fdc2 100644
--- a/resources/views/follows/modding.blade.php
+++ b/resources/views/follows/modding.blade.php
@@ -60,7 +60,7 @@
                                 <td class="beatmapset-watches__col beatmapset-watches__col--cover">
                                     <a href="{{ route('beatmapsets.discussion', $watch->beatmapset) }}">
                                         <div
-                                            {!! background_image($watch->beatmapset->coverURL('list'), false) !!}
+                                            {!! background_image($watch->beatmapset->coverURL('list')) !!}
                                             class="beatmapset-watches__cover"
                                         ></div>
                                     </a>
diff --git a/resources/views/forum/topics/_post_info.blade.php b/resources/views/forum/topics/_post_info.blade.php
index 1cd1800a49d..0b2cc37e46e 100644
--- a/resources/views/forum/topics/_post_info.blade.php
+++ b/resources/views/forum/topics/_post_info.blade.php
@@ -71,6 +71,17 @@ class="forum-post-info__row forum-post-info__row--title"
         </div>
     @endif
 
+    @if (($team = $user->team) !== null)
+        <div class="forum-post-info__row forum-post-info__row--flag">
+            <a
+                class="flag-team"
+                href="{{ route('teams.show', $team) }}"
+                {!! background_image($team->logo()->url()) !!}
+            >
+            </a>
+        </div>
+    @endif
+
     @if ($user->country !== null)
         <div class="forum-post-info__row forum-post-info__row--flag">
             <a href="{{route('rankings', [
@@ -78,10 +89,7 @@ class="forum-post-info__row forum-post-info__row--title"
                 'type' => 'performance',
                 'country' => $user->country->getKey(),
             ])}}">
-                @include('objects._flag_country', [
-                    'country' => $user->country,
-                    'modifiers' => 'medium',
-                ])
+                @include('objects._flag_country', ['country' => $user->country])
             </a>
         </div>
     @endif
diff --git a/resources/views/home/_search_result_user.blade.php b/resources/views/home/_search_result_user.blade.php
index 57c4e093add..efeb19a0731 100644
--- a/resources/views/home/_search_result_user.blade.php
+++ b/resources/views/home/_search_result_user.blade.php
@@ -2,7 +2,14 @@
     Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
     See the LICENCE file in the repository root for full licence text.
 --}}
+@php
+    use App\Transformers\UserCompactTransformer;
+@endphp
 <div class="js-react--user-cards"
-     data-modifiers="{{ json_encode(['search']) }}"
-     data-users="{{ json_encode(json_collection($search->data(), 'UserCompact', ['cover', 'country', 'groups'])) }}">
-</div>
+    data-modifiers="{{ json_encode(['search']) }}"
+    data-users="{{ json_encode(json_collection(
+        $search->data(),
+        new UserCompactTransformer(),
+        UserCompactTransformer::CARD_INCLUDES,
+    )) }}"
+></div>
diff --git a/resources/views/layout/_header_user.blade.php b/resources/views/layout/_header_user.blade.php
index 1905100230f..7e7d2338157 100644
--- a/resources/views/layout/_header_user.blade.php
+++ b/resources/views/layout/_header_user.blade.php
@@ -21,6 +21,6 @@ class="{{ $class }} avatar--guest"
         class="{{ $class }} {{ Auth::user()->isRestricted() ? 'avatar--restricted' : '' }}"
         data-click-menu-target="nav2-user-popup"
         href="{{ route('users.show', Auth::user()) }}"
-        {!! background_image(Auth::user()->user_avatar, false) !!}
+        {!! background_image(Auth::user()->user_avatar) !!}
     ></a>
 @endif
diff --git a/resources/views/layout/_page_header_v4.blade.php b/resources/views/layout/_page_header_v4.blade.php
index 963d1093f22..36d78c726da 100644
--- a/resources/views/layout/_page_header_v4.blade.php
+++ b/resources/views/layout/_page_header_v4.blade.php
@@ -24,7 +24,7 @@
 ">
     <div class="header-v4__container header-v4__container--main">
         <div class="header-v4__bg-container">
-            <div class="header-v4__bg {{ $backgroundExtraClass }}" {!! background_image($backgroundImage ?? null, false) !!}></div>
+            <div class="header-v4__bg {{ $backgroundExtraClass }}" {!! background_image($backgroundImage ?? null) !!}></div>
         </div>
 
         <div class="hidden-xs js-sync-height--target" data-sync-height-id="notification-banners">
diff --git a/resources/views/layout/_popup_user.blade.php b/resources/views/layout/_popup_user.blade.php
index e6393b8515a..724e95cf3ec 100644
--- a/resources/views/layout/_popup_user.blade.php
+++ b/resources/views/layout/_popup_user.blade.php
@@ -14,7 +14,7 @@ class="simple-menu simple-menu--nav2 js-click-menu js-nav2--centered-popup"
     <a
         href="{{ $currentUserUrl  }}"
         class="simple-menu__header simple-menu__header--link js-current-user-cover"
-        {!! background_image($currentUser->cover()->url(), false) !!}
+        {!! background_image($currentUser->cover()->url()) !!}
     >
         <img class="simple-menu__header-icon" src="/images/icons/profile.svg" alt="">
         <div class="u-relative">{{ $currentUser->username }}</div>
@@ -31,6 +31,12 @@ class="simple-menu__item"
         {{ osu_trans('layout.popup_user.links.profile') }}
     </a>
 
+    @if (($team = $currentUser->team) !== null)
+        <a class="simple-menu__item" href="{{ route('teams.show', $team) }}">
+            {{ osu_trans('layout.popup_user.links.team') }}
+        </a>
+    @endif
+
     <a class="simple-menu__item" href="{{ route('friends.index') }}">
         {{ osu_trans('layout.popup_user.links.friends') }}
     </a>
diff --git a/resources/views/layout/metadata.blade.php b/resources/views/layout/metadata.blade.php
index 64bc5034bd8..9364f456aef 100644
--- a/resources/views/layout/metadata.blade.php
+++ b/resources/views/layout/metadata.blade.php
@@ -96,9 +96,9 @@
 <script src="{{ unmix('js/runtime.js') }}" data-turbo-eval="false"></script>
 <script src="{{ unmix('js/vendor.js') }}" data-turbo-eval="false"></script>
 
-<script src="{{ unmix("js/locales/{$currentLocale}.js") }}" data-turbo-eval="false"></script>
+<script src="{{ unmix("js/locales/{$currentLocale}.js") }}" data-turbo-track="reload"></script>
 @if ($fallbackLocale !== $currentLocale)
-    <script src="{{ unmix("js/locales/{$fallbackLocale}.js") }}" data-turbo-eval="false"></script>
+    <script src="{{ unmix("js/locales/{$fallbackLocale}.js") }}" data-turbo-track="reload"></script>
 @endif
 
 <script src="{{ unmix('js/commons.js') }}" data-turbo-eval="false"></script>
diff --git a/resources/views/layout/ujs_full_reload.blade.php b/resources/views/layout/ujs_full_reload.blade.php
new file mode 100644
index 00000000000..58a93c38b26
--- /dev/null
+++ b/resources/views/layout/ujs_full_reload.blade.php
@@ -0,0 +1,5 @@
+{{--
+    Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+window.location.reload();
diff --git a/resources/views/multiplayer/rooms/_rankings_table.blade.php b/resources/views/multiplayer/rooms/_rankings_table.blade.php
index 24132cb2d99..468cafb645f 100644
--- a/resources/views/multiplayer/rooms/_rankings_table.blade.php
+++ b/resources/views/multiplayer/rooms/_rankings_table.blade.php
@@ -35,10 +35,16 @@
                 </td>
                 <td class="ranking-page-table__column">
                     <div class="ranking-page-table__user-link">
-                        @include('objects._flag_country', [
-                            'country' => $score->user->country,
-                            'modifiers' => 'medium',
-                        ])
+                        <span class="ranking-page-table__flags">
+                            @include('objects._flag_country', [
+                                'country' => $score->user->country,
+                            ])
+                            @if (($team = $score->user->team) !== null)
+                                <a class="u-contents" href="{{ route('teams.show', $team) }}">
+                                    @include('objects._flag_team', compact('team'))
+                                </a>
+                            @endif
+                        </span>
                         <a
                             href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode ?? null]) }}"
                             class="ranking-page-table__user-link-text js-usercard"
diff --git a/resources/views/objects/_flag_team.blade.php b/resources/views/objects/_flag_team.blade.php
new file mode 100644
index 00000000000..ca1e61f64d8
--- /dev/null
+++ b/resources/views/objects/_flag_team.blade.php
@@ -0,0 +1,9 @@
+{{--
+    Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+<span
+    class="{{ class_with_modifiers('flag-team', $modifiers ?? null) }}"
+    title="{{ $team->name }}"
+    {!! background_image($team->logo()->url()) !!}
+></span>
diff --git a/resources/views/rankings/_spotlight_rankings_table.blade.php b/resources/views/rankings/_spotlight_rankings_table.blade.php
index e36e937eb28..a99fe37fd91 100644
--- a/resources/views/rankings/_spotlight_rankings_table.blade.php
+++ b/resources/views/rankings/_spotlight_rankings_table.blade.php
@@ -38,10 +38,16 @@
                 </td>
                 <td class="ranking-page-table__column">
                     <div class="ranking-page-table__user-link">
-                        @include('objects._flag_country', [
-                            'country' => $score->user->country,
-                            'modifiers' => 'medium',
-                        ])
+                        <span class="ranking-page-table__flags">
+                            @include('objects._flag_country', [
+                                'country' => $score->user->country,
+                            ])
+                            @if (($team = $score->user->team) !== null)
+                                <a class="u-contents" href="{{ route('teams.show', $team) }}">
+                                    @include('objects._flag_team', compact('team'))
+                                </a>
+                            @endif
+                        </span>
                         <a
                             href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                             class="ranking-page-table__user-link-text js-usercard"
diff --git a/resources/views/rankings/kudosu.blade.php b/resources/views/rankings/kudosu.blade.php
index 79ca66774cb..82bfbe9ad76 100644
--- a/resources/views/rankings/kudosu.blade.php
+++ b/resources/views/rankings/kudosu.blade.php
@@ -37,10 +37,17 @@
                     </td>
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            @include('objects._flag_country', [
-                                'country' => $user->country_acronym,
-                                'modifiers' => 'medium',
-                            ])
+                            <span class="ranking-page-table__flags">
+                                @include('objects._flag_country', [
+                                    'country' => $user->country_acronym,
+                                ])
+
+                                @if (($team = $user->team) !== null)
+                                    <a class="u-contents" href="{{ route('teams.show', $team) }}">
+                                        @include('objects._flag_team', compact('team'))
+                                    </a>
+                                @endif
+                            </span>
                             {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
                         </div>
                     </td>
diff --git a/resources/views/rankings/performance.blade.php b/resources/views/rankings/performance.blade.php
index b957f678581..04cd936193a 100644
--- a/resources/views/rankings/performance.blade.php
+++ b/resources/views/rankings/performance.blade.php
@@ -108,19 +108,27 @@ class="{{ class_with_modifiers('ranking-page-table__column', 'rank-change-icon',
                     @endif
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            <a
-                                href="{{ route('rankings', [
-                                    'mode' => $mode,
-                                    'type' => 'performance',
-                                    'country' => $score->user->country->acronym,
-                                    'variant' => $variant,
-                                ]) }}"
-                            >
-                                @include('objects._flag_country', [
-                                    'country' => $score->user->country,
-                                    'modifiers' => 'medium',
-                                ])
-                            </a>
+                            <span class="ranking-page-table__flags">
+                                <a
+                                    class="u-contents"
+                                    href="{{ route('rankings', [
+                                        'mode' => $mode,
+                                        'type' => 'performance',
+                                        'country' => $score->user->country->acronym,
+                                        'variant' => $variant,
+                                    ]) }}"
+                                >
+                                    @include('objects._flag_country', [
+                                        'country' => $score->user->country,
+                                    ])
+                                </a>
+
+                                @if (($team = $score->user->team) !== null)
+                                    <a class="u-contents" href="{{ route('teams.show', $team) }}">
+                                        @include('objects._flag_team', compact('team'))
+                                    </a>
+                                @endif
+                            </span>
                             <a
                                 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                                 class="ranking-page-table__user-link-text js-usercard"
diff --git a/resources/views/rankings/score.blade.php b/resources/views/rankings/score.blade.php
index c6356b7b3e8..0a5f638acd6 100644
--- a/resources/views/rankings/score.blade.php
+++ b/resources/views/rankings/score.blade.php
@@ -49,12 +49,18 @@
                     </td>
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
-                            <a href="{{route('rankings', ['mode' => $mode, 'type' => 'performance', 'country' => $score->user->country->acronym])}}">
-                                @include('objects._flag_country', [
-                                    'country' => $score->user->country,
-                                    'modifiers' => 'medium',
-                                ])
-                            </a>
+                            <span class="ranking-page-table__flags">
+                                <a href="{{route('rankings', ['mode' => $mode, 'type' => 'performance', 'country' => $score->user->country_acronym])}}">
+                                    @include('objects._flag_country', [
+                                        'country' => $score->user->country,
+                                    ])
+                                </a>
+                                @if (($team = $score->user->team) !== null)
+                                    <a class="u-hover" href="{{ route('teams.show', $team) }}">
+                                        @include('objects._flag_team', compact('team'))
+                                    </a>
+                                @endif
+                            </span>
                             <a
                                 href="{{ route('users.show', ['user' => $score->user_id, 'mode' => $mode]) }}"
                                 class="ranking-page-table__user-link-text js-usercard"
diff --git a/resources/views/teams/edit.blade.php b/resources/views/teams/edit.blade.php
new file mode 100644
index 00000000000..91c57089f74
--- /dev/null
+++ b/resources/views/teams/edit.blade.php
@@ -0,0 +1,194 @@
+{{--
+    Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@php
+@endphp
+@extends('master')
+
+@section('content')
+    @include('layout._page_header_v4')
+
+    <form
+        method="POST"
+        action="{{ route('teams.update', ['team' => $team->getKey()]) }}"
+        enctype="multipart/form-data"
+        class="osu-page osu-page--generic-compact"
+        data-reload-on-success="1"
+    >
+        @csrf
+        <input name="_method" value="PUT" type="hidden" />
+
+        <div class="user-profile-pages user-profile-pages--no-tabs">
+            <div class="page-extra">
+                <h2 class="title title--page-extra-small title--page-extra-small-top">
+                    {{ osu_trans('teams.edit.settings.title') }}
+                </h2>
+
+                <div class="team-settings">
+                    <div class="team-settings__item">
+                        <label class="input-container">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.settings.url') }}
+                            </span>
+                            <input
+                                name="team[url]"
+                                class="input-text"
+                                value="{{ $team->url }}"
+                            />
+                        </label>
+                    </div>
+
+                    <div class="team-settings__item">
+                        <label class="input-container input-container--select">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.settings.default_ruleset') }}
+                            </span>
+                            <select
+                                name="team[default_ruleset_id]"
+                                class="input-text"
+                                value="{{ $team->default_ruleset_id }}"
+                            >
+                                @foreach (App\Models\Beatmap::MODES as $rulesetName => $rulesetId)
+                                    <option
+                                        value="{{ $rulesetId }}"
+                                        @if ($rulesetId === $team->default_ruleset_id)
+                                            selected
+                                        @endif
+                                    >
+                                        {{ osu_trans("beatmaps.mode.{$rulesetName}") }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </label>
+                        <span class="team-settings__help">
+                            {{ osu_trans('teams.edit.settings.default_ruleset_help') }}
+                        </span>
+                    </div>
+
+                    <div class="team-settings__item">
+                        <label class="input-container input-container--select">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.settings.application') }}
+                            </span>
+                            @php
+                                $currentIsOpen = $team->is_open;
+                            @endphp
+                            <select
+                                name="team[is_open]"
+                                class="input-text"
+                                value="{{ $currentIsOpen }}"
+                            >
+                                @foreach ([1, 0] as $isOpen)
+                                    <option
+                                        value="{{ $isOpen }}"
+                                        @if ($currentIsOpen === $isOpen)
+                                            selected
+                                        @endif
+                                    >
+                                        {{ osu_trans("teams.edit.settings.application_state.state_{$isOpen}") }}
+                                    </option>
+                                @endforeach
+                            </select>
+                        </label>
+                        <span class="team-settings__help">
+                            {{ osu_trans('teams.edit.settings.application_help') }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="page-extra">
+                <h2 class="title title--page-extra-small title--page-extra-small-top">
+                    {{ osu_trans('teams.edit.header.title') }}
+                </h2>
+                <div class="team-settings">
+                    <div class="team-settings__item team-settings__item--image">
+                        <img
+                            class="team-settings__image"
+                            src="{{ $team->header()->url() }}"
+                        >
+                        <label class="input-container">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.header.label') }}
+                            </span>
+                            <input class="input-text" type="file" name="team[header]">
+                        </label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="page-extra">
+                <h2 class="title title--page-extra-small title--page-extra-small-top">
+                    {{ osu_trans('teams.edit.logo.title') }}
+                </h2>
+                <div class="team-settings">
+                    <div class="team-settings__item team-settings__item--image">
+                        <img
+                            class="team-settings__image"
+                            src="{{ $team->logo()->url() }}"
+                        >
+                        <label class="input-container">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.logo.label') }}
+                            </span>
+                            <input class="input-text" type="file" name="team[logo]">
+                        </label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="page-extra">
+                <h2 class="title title--page-extra-small title--page-extra-small-top">
+                    {{ osu_trans('teams.edit.description.title') }}
+                </h2>
+
+                <div class="team-settings">
+                    <div class="team-settings__item team-settings__item--description">
+                        <label class="input-container">
+                            <span class="input-container__label">
+                                {{ osu_trans('teams.edit.description.label') }}
+                            </span>
+                            <div class="input-text input-text--bbcode">
+                                <textarea
+                                    name="team[description]"
+                                    class="input-text__bbcode-textarea js-post-preview--auto js-bbcode-body"
+                                >{{ $team->description }}</textarea>
+                                @include('forum._post_toolbar')
+                            </div>
+                        </label>
+
+                        <div class="team-settings__description-preview u-fancy-scrollbar">
+                            <div class="team-settings-description-preview js-post-preview--preview">
+                                {!! $team->descriptionHtml() !!}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="page-extra-container">
+                <div class="page-extra">
+                    <div class="team-settings">
+                        <div class="team-settings__item team-settings__item--buttons">
+                            <div>
+                                <a
+                                    class="btn-osu-big btn-osu-big--rounded-thin"
+                                    href="{{ route('teams.show', ['team' => $team]) }}"
+                                >
+                                    {{ osu_trans('common.buttons.cancel') }}
+                                </a>
+                            </div>
+
+                            <div>
+                                <button class="btn-osu-big btn-osu-big--rounded-thin">
+                                    {{ osu_trans('common.buttons.save') }}
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/teams/members/index.blade.php b/resources/views/teams/members/index.blade.php
new file mode 100644
index 00000000000..2befc8268da
--- /dev/null
+++ b/resources/views/teams/members/index.blade.php
@@ -0,0 +1,99 @@
+{{--
+    Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@extends('master')
+
+@section('content')
+    @include('layout._page_header_v4', ['params' => [
+        'theme' => 'team',
+        'backgroundImage' => $team->header()->url(),
+    ]])
+
+    <div class="osu-page osu-page--generic-compact">
+        <div class="user-profile-pages user-profile-pages--no-tabs">
+            <div class="page-extra">
+                <h2 class="title title--page-extra-small title--page-extra-small-top">
+                    {{ osu_trans('teams.members.index.table.title') }}
+                </h2>
+                <ul class="team-members-manage">
+                    <li class="team-members-manage__item team-members-manage__item--header">
+                        <span></span>
+                        <span>{{ osu_trans('teams.members.index.table.status') }}</span>
+                        <span>{{ osu_trans('teams.members.index.table.joined_at') }}</span>
+                        <span></span>
+                    @foreach ($team->members as $member)
+                        @php
+                            $user = $member->userOrDeleted();
+                        @endphp
+                        <li class="team-members-manage__item">
+                            <a
+                                class="team-members-manage__username js-usercard"
+                                data-user-id="{{ $user->getKey() }}"
+                                href="{{ route('users.show', $user->getKey()) }}"
+                            >
+                                <span class="team-members-manage__avatar">
+                                    <span
+                                        class="avatar avatar--full avatar--guest"
+                                        {!! background_image($user->user_avatar) !!}
+                                    ></span>
+                                </span>
+
+                                {{ $user->username }}
+                            </a>
+                            <span>
+                                {{ osu_trans('teams.members.index.status.status_'.(int) $user->isActive()) }}
+                                @if ($user->isOnline())
+                                    <small>
+                                        ({!! osu_trans('users.show.lastvisit_online') !!})
+                                    </small>
+                                @elseif (($lastvisit = $user->displayed_last_visit) !== null)
+                                    <small>
+                                        ({!! osu_trans('users.show.lastvisit', ['date' => timeago($lastvisit)]) !!})
+                                    </small>
+                                @endif
+                            </span>
+                            <span>
+                                {!! timeago($member->created_at) !!}
+                            </span>
+                            <span>
+                                <form
+                                    action="{{ route('teams.members.destroy', compact('member', 'team')) }}"
+                                    class="u-contents"
+                                    data-confirm="{{ osu_trans('common.confirmation') }}"
+                                    data-reload-on-success="1"
+                                    data-remote="1"
+                                    method="POST"
+                                >
+                                    <input type="hidden" name="_method" value="DELETE" />
+                                    <button
+                                        class="btn-osu-big btn-osu-big--rounded-small"
+                                        {{ $member->user_id === $team->leader_id ? 'disabled' : '' }}
+                                    >
+                                        {{ osu_trans('teams.members.index.table.remove') }}
+                                    </button>
+                                </form>
+                            </span>
+                    @endforeach
+                </ul>
+            </div>
+
+            <div class="page-extra">
+                <div class="team-settings">
+                    <div class="team-settings__item team-settings__item--buttons">
+                        <div>
+                            <a
+                                class="btn-osu-big btn-osu-big--rounded-thin"
+                                href="{{ route('teams.show', ['team' => $team]) }}"
+                            >
+                                {{ osu_trans('common.buttons.back') }}
+                            </a>
+                        </div>
+
+                        <div></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/teams/show.blade.php b/resources/views/teams/show.blade.php
index 40396032c35..ae9e5927d8e 100644
--- a/resources/views/teams/show.blade.php
+++ b/resources/views/teams/show.blade.php
@@ -6,14 +6,21 @@
     use App\Transformers\UserCompactTransformer;
 
     $userTransformer = new UserCompactTransformer();
-    $teamMembers = array_map(
-        fn ($users) => json_collection($users, $userTransformer, UserCompactTransformer::CARD_INCLUDES),
-        $team->members->mapToGroups(fn ($member) => [
-            $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->user,
-        ])->all(),
-    );
+    $toJson = fn ($users) => json_collection($users, $userTransformer, UserCompactTransformer::CARD_INCLUDES);
+    $teamMembers = array_map($toJson, $team->members->mapToGroups(fn ($member) => [
+        $member->user_id === $team->leader_id ? 'leader' : 'member' => $member->userOrDeleted(),
+    ])->all());
     $teamMembers['member'] ??= [];
+    $teamMembers['leader'] ??= $toJson([$team->members()->make(['user_id' => $team->leader_id])->userOrDeleted()]);
     $headerUrl = $team->header()->url();
+
+    $buttons = new Ds\Set();
+    if (priv_check('TeamPart', $team)->can()) {
+        $buttons->add('part');
+    }
+    if (priv_check('TeamUpdate', $team)->can()) {
+        $buttons->add('destroy');
+    }
 @endphp
 
 @extends('master', [
@@ -26,93 +33,139 @@
         'backgroundImage' => $headerUrl,
     ]])
 
-    <div class="osu-layout osu-layout--full">
-        <div class="osu-page osu-page--generic-compact">
-            <div class="profile-info profile-info--cover profile-info--team">
-                <div
-                    class="profile-info__bg profile-info__bg--team"
-                    {!! background_image($headerUrl) !!}
-                ></div>
-                <div class="profile-info__details">
-                    <div
-                        class="profile-info__avatar"
-                        {!! background_image($team->logo()->url()) !!}
-                    ></div>
-                    <div class="profile-info__info">
-                        <h1 class="profile-info__name">
-                            {{ $team->name }}
-                        </h1>
-                        <div class="profile-info__flags">
-                            <p class="profile-info__flag">
-                                [{{ $team->short_name }}]
-                            </p>
-                        </div>
+    <div class="osu-page osu-page--generic-compact">
+        <div class="profile-info profile-info--cover profile-info--team">
+            <div
+                class="profile-info__bg profile-info__bg--team"
+                {!! background_image($headerUrl) !!}
+            >
+                @if (priv_check('TeamUpdate', $team)->can())
+                    <div class="profile-page-cover-editor-button">
+                        <a
+                            class="btn-circle btn-circle--page-toggle"
+                            data-tooltip-position="left center"
+                            href="{{ route('teams.members.index', $team) }}"
+                            title="{{ osu_trans('teams.members.index.title') }}"
+                        >
+                            <span class="fa fa-users"></span>
+                        </a>
+
+                        <a
+                            class="btn-circle btn-circle--page-toggle"
+                            data-tooltip-position="left center"
+                            href="{{ route('teams.edit', $team) }}"
+                            title="{{ osu_trans('teams.edit.title') }}"
+                        >
+                            <span class="fa fa-wrench"></span>
+                        </a>
+                    </div>
+                @endif
+            </div>
+            <div class="profile-info__details">
+                <div class="profile-info__avatar">
+                    @include('objects._flag_team', ['modifiers' => 'full', 'team' => $team])
+                </div>
+                <div class="profile-info__info">
+                    <h1 class="profile-info__name">
+                        {{ $team->name }}
+                    </h1>
+                    <div class="profile-info__flags">
+                        <p class="profile-info__flag">
+                            [{{ $team->short_name }}]
+                        </p>
                     </div>
                 </div>
             </div>
-            <div class="user-profile-pages user-profile-pages--no-tabs">
-                <div class="page-extra u-fancy-scrollbar">
-                    <div class="team-summary">
-                        <div class="team-summary__sidebar">
-                            <h2 class="title title--page-extra-small title--page-extra-small-top">
-                                {{ osu_trans('teams.show.sections.info') }}
-                            </h2>
-                            <div class="team-info-entries">
+        </div>
+        @if (!$buttons->isEmpty())
+            <div class="profile-detail-bar profile-detail-bar--team">
+                @if ($buttons->contains('destroy'))
+                    <form
+                        action="{{ route('teams.destroy', $team) }}"
+                        data-turbo-confirm="{{ osu_trans('common.confirmation') }}"
+                        method="POST"
+                    >
+                        <input type="hidden" name="_method" value="DELETE">
+                        <button class="team-action-button team-action-button--part">
+                            {{ osu_trans('teams.show.bar.destroy') }}
+                        </button>
+                    </form>
+                @endif
+                @if ($buttons->contains('part'))
+                    <form
+                        action="{{ route('teams.part', ['team' => $team]) }}"
+                        data-turbo-confirm="{{ osu_trans('common.confirmation') }}"
+                        method="POST"
+                    >
+                        <button class="team-action-button team-action-button--part">
+                            {{ osu_trans('teams.show.bar.part') }}
+                        </button>
+                    </form>
+                @endif
+            </div>
+        @endif
+        <div class="user-profile-pages user-profile-pages--no-tabs">
+            <div class="page-extra u-fancy-scrollbar">
+                <div class="team-summary">
+                    <div class="team-summary__sidebar">
+                        <h2 class="title title--page-extra-small title--page-extra-small-top">
+                            {{ osu_trans('teams.show.sections.info') }}
+                        </h2>
+                        <div class="team-info-entries">
+                            <div class="team-info-entry">
+                                <div class="team-info-entry__title">{{ osu_trans('teams.show.info.created') }}</div>
+                                <div class="team-info-entry__value">
+                                    {{ i18n_date($team->created_at, pattern: 'year_month') }}
+                                </div>
+                            </div>
+                            @if (present($team->url))
                                 <div class="team-info-entry">
-                                    <div class="team-info-entry__title">{{ osu_trans('teams.show.info.created') }}</div>
+                                    <div class="team-info-entry__title">{{ osu_trans('teams.show.info.website') }}</div>
                                     <div class="team-info-entry__value">
-                                        {{ i18n_date($team->created_at, pattern: 'year_month') }}
+                                        <span class="u-ellipsis-overflow">
+                                            <a href="{{ $team->url }}">{{ $team->url }}</a>
+                                        </span>
                                     </div>
                                 </div>
-                                @if (present($team->url))
-                                    <div class="team-info-entry">
-                                        <div class="team-info-entry__title">{{ osu_trans('teams.show.info.website') }}</div>
-                                        <div class="team-info-entry__value">
-                                            <span class="u-ellipsis-overflow">
-                                                <a href="{{ $team->url }}">{{ $team->url }}</a>
-                                            </span>
-                                        </div>
-                                    </div>
-                                @endif
+                            @endif
+                        </div>
+                        <h2 class="title title--page-extra-small title--page-extra-small-top">
+                            {{ osu_trans('teams.show.sections.members') }}
+                        </h2>
+                        <div class="team-summary__members">
+                            <div class="team-members team-members--owner">
+                                <div class="team-members__meta">
+                                    {{ osu_trans('teams.show.members.owner') }}
+                                </div>
+                                <div
+                                    class="js-react--user-card u-contents"
+                                    data-user="{{ json_encode($teamMembers['leader'][0]) }}"
+                                ></div>
                             </div>
-                            <h2 class="title title--page-extra-small title--page-extra-small-top">
-                                {{ osu_trans('teams.show.sections.members') }}
-                            </h2>
-                            <div class="team-summary__members">
-                                <div class="team-members team-members--owner">
-                                    <div class="team-members__meta">
-                                        {{ osu_trans('teams.show.members.owner') }}
-                                    </div>
+
+                            <div class="team-members">
+                                <div class="team-members__meta">
+                                    <span>
+                                        {{ osu_trans('teams.show.members.members') }}
+                                    </span>
+                                    <span>
+                                        {{ i18n_number_format(count($teamMembers['member'])) }}
+                                    </span>
+                                </div>
+                                @foreach ($teamMembers['member'] as $memberJson)
                                     <div
                                         class="js-react--user-card u-contents"
-                                        data-user="{{ json_encode($teamMembers['leader'][0]) }}"
+                                        data-user="{{ json_encode($memberJson) }}"
                                     ></div>
-                                </div>
-
-                                <div class="team-members">
-                                    <div class="team-members__meta">
-                                        <span>
-                                            {{ osu_trans('teams.show.members.members') }}
-                                        </span>
-                                        <span>
-                                            {{ i18n_number_format(count($teamMembers['member'])) }}
-                                        </span>
-                                    </div>
-                                    @foreach ($teamMembers['member'] as $memberJson)
-                                        <div
-                                            class="js-react--user-card u-contents"
-                                            data-user="{{ json_encode($memberJson) }}"
-                                        ></div>
-                                    @endforeach
-                                </div>
+                                @endforeach
                             </div>
                         </div>
+                    </div>
 
-                        <div class="team-summary__sidebar team-summary__sidebar--separator"></div>
+                    <div class="team-summary__sidebar team-summary__sidebar--separator"></div>
 
-                        <div>
-                            {!! $team->descriptionHtml() !!}
-                        </div>
+                    <div>
+                        {!! $team->descriptionHtml() !!}
                     </div>
                 </div>
             </div>
diff --git a/routes/web.php b/routes/web.php
index f4aa9f60fc9..b601b239d58 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -296,7 +296,11 @@
     Route::post('user-cover-presets/batch-activate', 'UserCoverPresetsController@batchActivate')->name('user-cover-presets.batch-activate');
     Route::resource('user-cover-presets', 'UserCoverPresetsController', ['only' => ['index', 'store', 'update']]);
 
-    Route::resource('teams', 'TeamsController', ['only' => ['show']]);
+    Route::group(['as' => 'teams.', 'prefix' => 'teams/{team}'], function () {
+        Route::post('part', 'TeamsController@part')->name('part');
+        Route::resource('members', 'Teams\MembersController', ['only' => ['destroy', 'index']]);
+    });
+    Route::resource('teams', 'TeamsController', ['only' => ['destroy', 'edit', 'show', 'update']]);
 
     Route::post('users/check-username-availability', 'UsersController@checkUsernameAvailability')->name('users.check-username-availability');
     Route::get('users/lookup', 'Users\LookupController@index')->name('users.lookup');
@@ -427,7 +431,7 @@
                     });
                 });
 
-                Route::apiResource('tags', 'BeatmapTagsController', ['only' => ['index', 'store', 'destroy']]);
+                Route::apiResource('tags', 'BeatmapTagsController', ['only' => ['store', 'destroy']]);
             });
         });
 
@@ -505,6 +509,8 @@
             Route::get('{rulesetOrScore}/{score}/download', 'ScoresController@download')->middleware(ThrottleRequests::getApiThrottle('scores_download'))->name('download-legacy');
 
             Route::get('{rulesetOrScore}/{score?}', 'ScoresController@show')->name('show');
+
+            Route::get('/', 'ScoresController@index');
         });
 
         // Beatmapsets
@@ -586,6 +592,7 @@
             Route::group(['prefix' => '{beatmapset}'], function () {
                 Route::post('broadcast-new', 'BeatmapsetsController@broadcastNew')->name('broadcast-new');
                 Route::post('broadcast-revive', 'BeatmapsetsController@broadcastRevive')->name('broadcast-revive');
+                Route::post('broadcast-update', 'BeatmapsetsController@broadcastUpdate')->name('broadcast-update');
                 Route::post('disqualify', 'BeatmapsetsController@disqualify')->name('disqualify');
             });
         });
@@ -595,6 +602,11 @@
             Route::apiResource('bulk', 'Indexing\BulkController', ['only' => ['store']]);
         });
 
+        Route::group(['as' => 'multiplayer.', 'namespace' => 'Multiplayer', 'prefix' => 'multiplayer'], function () {
+            Route::put('rooms/{room}/users/{user}', 'RoomsController@join')->name('rooms.join');
+            Route::apiResource('rooms', 'RoomsController', ['only' => ['store']]);
+        });
+
         Route::post('user-achievement/{user}/{achievement}/{beatmap?}', 'UsersController@achievement')->name('users.achievement');
 
         Route::group(['as' => 'user-group.'], function () {
diff --git a/tests/Browser/SanityTest.php b/tests/Browser/SanityTest.php
index d97bb0e5c8c..ac81bc52a1b 100644
--- a/tests/Browser/SanityTest.php
+++ b/tests/Browser/SanityTest.php
@@ -276,7 +276,7 @@ private static function createScaffolding()
         self::$scaffolding['daily_challenge_room'] = Room::factory()->create(['category' => 'daily_challenge']);
         PlaylistItem::factory()->create(['room_id' => self::$scaffolding['daily_challenge_room']]);
 
-        self::$scaffolding['team'] = Team::factory()->create();
+        self::$scaffolding['team'] = Team::factory()->create(['leader_id' => self::$scaffolding['user']]);
     }
 
     private static function filterLog(array $log)
diff --git a/tests/Controllers/BeatmapTagsControllerTest.php b/tests/Controllers/BeatmapTagsControllerTest.php
index 84b17bd570f..f75438c1454 100644
--- a/tests/Controllers/BeatmapTagsControllerTest.php
+++ b/tests/Controllers/BeatmapTagsControllerTest.php
@@ -12,7 +12,6 @@
 use App\Models\Solo\Score;
 use App\Models\Tag;
 use App\Models\User;
-use Illuminate\Testing\Fluent\AssertableJson;
 use Tests\TestCase;
 
 class BeatmapTagsControllerTest extends TestCase
@@ -21,21 +20,6 @@ class BeatmapTagsControllerTest extends TestCase
     private Beatmap $beatmap;
     private BeatmapTag $beatmapTag;
 
-    public function testIndex(): void
-    {
-        $this->actAsScopedUser(User::factory()->create(), ['public']);
-
-        $this
-            ->get(route('api.beatmaps.tags.index', ['beatmap' => $this->beatmap->getKey()]))
-            ->assertSuccessful()
-            ->assertJson(fn (AssertableJson $json) =>
-                $json
-                    ->where('beatmap_tags.0.id', $this->tag->getKey())
-                    ->where('beatmap_tags.0.name', $this->tag->name)
-                    ->where('beatmap_tags.0.count', 1)
-                    ->etc());
-    }
-
     public function testStore(): void
     {
         $user = User::factory()
diff --git a/tests/Controllers/Chat/ChannelsControllerTest.php b/tests/Controllers/Chat/ChannelsControllerTest.php
index dac9bbc3b51..6b097bcc1cf 100644
--- a/tests/Controllers/Chat/ChannelsControllerTest.php
+++ b/tests/Controllers/Chat/ChannelsControllerTest.php
@@ -205,7 +205,7 @@ public function testChannelJoinMultiplayerWhenParticipated()
             'user' => $this->user->getKey(),
         ]));
 
-        $request->assertStatus(200)->assertJsonFragment(['channel_id' => $scoreLink->playlistItem->room->channel_id, 'type' => Channel::TYPES['multiplayer']]);
+        $request->assertStatus(403);
     }
 
     //endregion
diff --git a/tests/Controllers/InterOp/Multiplayer/RoomsControllerTest.php b/tests/Controllers/InterOp/Multiplayer/RoomsControllerTest.php
new file mode 100644
index 00000000000..353e1902eea
--- /dev/null
+++ b/tests/Controllers/InterOp/Multiplayer/RoomsControllerTest.php
@@ -0,0 +1,101 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace Tests\Controllers\InterOp\Multiplayer;
+
+use App\Models\Beatmap;
+use App\Models\Chat\UserChannel;
+use App\Models\Multiplayer\Room;
+use App\Models\User;
+use Carbon\CarbonImmutable;
+use Tests\TestCase;
+
+class RoomsControllerTest extends TestCase
+{
+    private static function startRoomParams(): array
+    {
+        $beatmap = Beatmap::factory()->create();
+
+        return [
+            'ends_at' => CarbonImmutable::now()->addHours(1),
+            'name' => 'test room',
+            'type' => Room::REALTIME_DEFAULT_TYPE,
+            'playlist' => [[
+                'beatmap_id' => $beatmap->getKey(),
+                'ruleset_id' => $beatmap->playmode,
+            ]],
+        ];
+    }
+
+    public function testJoin(): void
+    {
+        $room = (new Room())->startGame(User::factory()->create(), static::startRoomParams());
+        $user = User::factory()->create();
+
+        $this->expectCountChange(fn () => UserChannel::count(), 1);
+
+        $this->withInterOpHeader(
+            route('interop.multiplayer.rooms.join', [
+                'room' => $room->getKey(),
+                'user' => $user->getKey(),
+            ]),
+            fn ($url) => $this->put($url),
+        )->assertSuccessful();
+    }
+
+    public function testJoinWithPassword(): void
+    {
+        $room = (new Room())->startGame(User::factory()->create(), [
+            ...static::startRoomParams(),
+            'password' => 'hunter2',
+        ]);
+        $user = User::factory()->create();
+
+        $this->expectCountChange(fn () => UserChannel::count(), 1);
+
+        $this->withInterOpHeader(
+            route('interop.multiplayer.rooms.join', [
+                'room' => $room->getKey(),
+                'user' => $user->getKey(),
+            ]),
+            fn ($url) => $this->put($url, ['password' => 'hunter2']),
+        )->assertSuccessful();
+    }
+
+    public function testJoinWithPasswordInvalid(): void
+    {
+        $room = (new Room())->startGame(User::factory()->create(), [
+            ...static::startRoomParams(),
+            'password' => 'hunter2',
+        ]);
+        $user = User::factory()->create();
+
+        $this->expectCountChange(fn () => UserChannel::count(), 0);
+
+        $this->withInterOpHeader(
+            route('interop.multiplayer.rooms.join', [
+                'room' => $room->getKey(),
+                'user' => $user->getKey(),
+            ]),
+            fn ($url) => $this->put($url, ['password' => '*******']),
+        )->assertStatus(403);
+    }
+
+    public function testStore(): void
+    {
+        $beatmap = Beatmap::factory()->create();
+        $params = [
+            ...static::startRoomParams(),
+            'user_id' => User::factory()->create()->getKey(),
+        ];
+
+        $this->expectCountChange(fn () => Room::count(), 1);
+
+        $this->withInterOpHeader(
+            route('interop.multiplayer.rooms.store'),
+            fn ($url) => $this->post($url, $params),
+        )->assertSuccessful();
+    }
+}
diff --git a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php
index 2477e8d1518..bdbe0d69f72 100644
--- a/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php
+++ b/tests/Controllers/Multiplayer/Rooms/Playlist/ScoresControllerTest.php
@@ -169,7 +169,7 @@ public function testUpdate($bodyParams, $status)
         $playlistItem = PlaylistItem::factory()->create();
         $room = $playlistItem->room;
         $build = Build::factory()->create(['allow_ranking' => true]);
-        $scoreToken = $room->startPlay($user, $playlistItem, 0);
+        $scoreToken = static::roomStartPlay($user, $playlistItem);
 
         $this->withHeaders(['x-token' => static::createClientToken($build)]);
 
diff --git a/tests/Controllers/ScoreTokensControllerTest.php b/tests/Controllers/ScoreTokensControllerTest.php
index e75d971fee0..1dc2c84a305 100644
--- a/tests/Controllers/ScoreTokensControllerTest.php
+++ b/tests/Controllers/ScoreTokensControllerTest.php
@@ -45,7 +45,7 @@ public function testStore(string $beatmapState, int $status): void
     /**
      * @dataProvider dataProviderForTestStoreInvalidParameter
      */
-    public function testStoreInvalidParameter(string $paramKey, ?string $paramValue, int $status): void
+    public function testStoreInvalidParameter(string $paramKey, ?string $paramValue, int $status, string $errorMessage): void
     {
         $origClientCheckVersion = $GLOBALS['cfg']['osu']['client']['check_version'];
         config_set('osu.client.check_version', true);
@@ -78,14 +78,6 @@ public function testStoreInvalidParameter(string $paramKey, ?string $paramValue,
 
         $this->expectCountChange(fn () => ScoreToken::count(), 0);
 
-        $errorMessage = $paramValue === null ? 'missing' : 'invalid';
-        $errorMessage .= ' ';
-        $errorMessage .= $paramKey === 'client_token'
-            ? ($paramValue === null
-                ? 'token header'
-                : 'client hash'
-            ) : $paramKey;
-
         $this->json(
             'POST',
             route('api.beatmaps.solo.score-tokens.store', $routeParams),
@@ -161,14 +153,14 @@ public static function dataProviderForTestStore(): array
     public static function dataProviderForTestStoreInvalidParameter(): array
     {
         return [
-            'invalid client token' => ['client_token', md5('invalid_'), 422],
-            'missing client token' => ['client_token', null, 422],
+            'invalid client token' => ['client_token', md5('invalid_'), 422, 'invalid client hash'],
+            'missing client token' => ['client_token', null, 422, 'missing token header'],
 
-            'invalid ruleset id' => ['ruleset_id', '5', 422],
-            'missing ruleset id' => ['ruleset_id', null, 422],
+            'invalid ruleset id' => ['ruleset_id', '5', 422, 'invalid ruleset_id'],
+            'missing ruleset id' => ['ruleset_id', null, 422, 'missing ruleset_id'],
 
-            'invalid beatmap hash' => ['beatmap_hash', 'xxx', 422],
-            'missing beatmap hash' => ['beatmap_hash', null, 422],
+            'invalid beatmap hash' => ['beatmap_hash', 'xxx', 422, 'invalid or missing beatmap_hash'],
+            'missing beatmap hash' => ['beatmap_hash', null, 422, 'invalid or missing beatmap_hash'],
         ];
     }
 
diff --git a/tests/Libraries/Beatmapset/ChangeBeatmapOwnersTest.php b/tests/Libraries/Beatmapset/ChangeBeatmapOwnersTest.php
index dcafe6da068..df6e815b4e4 100644
--- a/tests/Libraries/Beatmapset/ChangeBeatmapOwnersTest.php
+++ b/tests/Libraries/Beatmapset/ChangeBeatmapOwnersTest.php
@@ -23,6 +23,14 @@
 
 class ChangeBeatmapOwnersTest extends TestCase
 {
+    public static function dataProviderForInvalidUser(): array
+    {
+        return [
+            ['bot'],
+            ['no_profile'],
+        ];
+    }
+
     public static function dataProviderForUpdateOwner(): array
     {
         return [
@@ -68,6 +76,33 @@ public function testMissingUser(): void
         Bus::assertDispatched(BeatmapOwnerChange::class);
     }
 
+    /**
+     * @dataProvider dataProviderForInvalidUser
+     */
+    public function testInvalidUser(string $group): void
+    {
+        $moderator = User::factory()->withGroup('nat')->create();
+        $owner = User::factory()->create();
+        $invalidUser = User::factory()->withGroup($group)->create();
+
+        $beatmap = Beatmap::factory()
+            ->for(Beatmapset::factory()->pending()->owner($owner))
+            ->owner($owner)
+            ->create();
+
+        $this->expectCountChange(fn () => BeatmapsetEvent::count(), 0);
+
+        $this->expectExceptionCallable(
+            fn () => (new ChangeBeatmapOwners($beatmap, [$invalidUser->getKey()], $moderator))->handle(),
+            InvariantException::class,
+        );
+
+        $beatmap = $beatmap->fresh();
+        $this->assertEqualsCanonicalizing([$owner->getKey()], $beatmap->getOwners()->pluck('user_id')->toArray());
+
+        Bus::assertNotDispatched(BeatmapOwnerChange::class);
+    }
+
     /**
      * @dataProvider dataProviderForUpdateOwner
      */
diff --git a/tests/Models/ChangelogEntryTest.php b/tests/Models/ChangelogEntryTest.php
index 367da68468b..e4e31beec7c 100644
--- a/tests/Models/ChangelogEntryTest.php
+++ b/tests/Models/ChangelogEntryTest.php
@@ -12,12 +12,11 @@
 class ChangelogEntryTest extends TestCase
 {
     /**
-     * @dataProvider dataForPublicMessageHtmlVisibility
+     * @dataProvider dataForGetDisplayMessage
      */
-    public function testPublicMessageHtmlVisibility($message, $html)
+    public function testGetDisplayMessage($message, $html)
     {
-        $entry = new ChangelogEntry(compact('message'));
-        $this->assertSame($html, $entry->publicMessageHtml());
+        $this->assertSame($html, ChangelogEntry::getDisplayMessage($message));
     }
 
     public function testConvertLegacyChangelogWithTitle()
@@ -26,7 +25,7 @@ public function testConvertLegacyChangelogWithTitle()
         $legacy = new Changelog(['message' => $title]);
         $converted = ChangelogEntry::convertLegacy($legacy);
         $this->assertSame($title, $converted->title);
-        $this->assertNull($converted->publicMessageHtml());
+        $this->assertNull($converted->messageHtml());
     }
 
     public function testConvertLegacyChangelogWithTitleAndMessage()
@@ -36,7 +35,7 @@ public function testConvertLegacyChangelogWithTitleAndMessage()
         $legacy = new Changelog(['message' => "{$title}\n\n---\n{$message}"]);
         $converted = ChangelogEntry::convertLegacy($legacy);
         $this->assertSame($title, $converted->title);
-        $this->assertSame("<div class='changelog-md'><p class=\"changelog-md__paragraph\">{$message}</p>\n</div>", $converted->publicMessageHtml());
+        $this->assertSame("<div class='changelog-md'><p class=\"changelog-md__paragraph\">{$message}</p>\n</div>", $converted->messageHtml());
     }
 
     public function testConvertLegacyChangelogWithMessage()
@@ -45,7 +44,7 @@ public function testConvertLegacyChangelogWithMessage()
         $legacy = new Changelog(['message' => "---\n{$message}"]);
         $converted = ChangelogEntry::convertLegacy($legacy);
         $this->assertSame($message, $converted->title);
-        $this->assertNull($converted->publicMessageHtml());
+        $this->assertNull($converted->messageHtml());
     }
 
     public function testGuessCategoryCapitalise()
@@ -131,17 +130,17 @@ public function testIsPrivate()
         $this->assertTrue(ChangelogEntry::isPrivate($data));
     }
 
-    public static function dataForPublicMessageHtmlVisibility()
+    public static function dataForGetDisplayMessage()
     {
         return [
-            ['Hidden', null],
-            ["---\nVisible", "<div class='changelog-md'><p class=\"changelog-md__paragraph\">Visible</p>\n</div>"],
-            ["Hidden\n---", null],
-            ["Hidden\n\n---", null],
-            ["Hidden\n\n---Still hidden", null],
-            ["Hidden\n---\n\nStill hidden", null],
-            ["Hidden\n---\nStill hidden", null],
-            ["Hidden\n\n---\nVisible", "<div class='changelog-md'><p class=\"changelog-md__paragraph\">Visible</p>\n</div>"],
+            ['Hidden', ''],
+            ["Visible\n\n---", 'Visible'],
+            ["---\nHidden", ''],
+            ['---Hidden', ''],
+            ['Still hidden---', ''],
+            ["Hidden\n---\n\nStill hidden", ''],
+            ["Hidden\n---\nStill hidden", ''],
+            ["Visible\n\n---\nHidden", 'Visible'],
         ];
     }
 }
diff --git a/tests/Models/ModelCompositePrimaryKeysTest.php b/tests/Models/ModelCompositePrimaryKeysTest.php
index d2e02b3edac..58d8b97575f 100644
--- a/tests/Models/ModelCompositePrimaryKeysTest.php
+++ b/tests/Models/ModelCompositePrimaryKeysTest.php
@@ -10,6 +10,7 @@
 use App\Models\BeatmapDifficulty;
 use App\Models\BeatmapDifficultyAttrib;
 use App\Models\BeatmapFailtimes;
+use App\Models\BeatmapTag;
 use App\Models\Chat;
 use App\Models\FavouriteBeatmapset;
 use App\Models\Forum;
@@ -112,6 +113,16 @@ public static function dataProviderBase()
                 ['type' => 'exit'],
                 ['p1', [0, 10], 11],
             ],
+            [
+                BeatmapTag::class,
+                [
+                    'beatmap_id' => 0,
+                    'tag_id' => 0,
+                    'user_id' => 0,
+                ],
+                ['tag_id' => 1],
+                ['updated_at', [Carbon::now()->subDays(5), Carbon::now()->subDays(1)], Carbon::now()],
+            ],
             [
                 Chat\UserChannel::class,
                 [
diff --git a/tests/Models/Multiplayer/RoomTest.php b/tests/Models/Multiplayer/RoomTest.php
index 3a1f8307417..ca8a951478b 100644
--- a/tests/Models/Multiplayer/RoomTest.php
+++ b/tests/Models/Multiplayer/RoomTest.php
@@ -124,7 +124,7 @@ public function testRoomHasEnded()
         ]);
 
         $this->expectException(InvariantException::class);
-        $room->startPlay($user, $playlistItem, 0);
+        static::roomStartPlay($user, $playlistItem);
     }
 
     public function testStartPlay(): void
@@ -137,7 +137,7 @@ public function testStartPlay(): void
         $this->expectCountChange(fn () => $room->userHighScores()->count(), 1);
         $this->expectCountChange(fn () => $playlistItem->scoreTokens()->count(), 1);
 
-        $room->startPlay($user, $playlistItem, 0);
+        static::roomStartPlay($user, $playlistItem);
         $room->refresh();
 
         $this->assertSame($user->getKey(), $playlistItem->scoreTokens()->last()->user_id);
@@ -150,14 +150,14 @@ public function testMaxAttemptsReached()
         $playlistItem1 = PlaylistItem::factory()->create(['room_id' => $room]);
         $playlistItem2 = PlaylistItem::factory()->create(['room_id' => $room]);
 
-        $room->startPlay($user, $playlistItem1, 0);
+        static::roomStartPlay($user, $playlistItem1);
         $this->assertTrue(true);
 
-        $room->startPlay($user, $playlistItem2, 0);
+        static::roomStartPlay($user, $playlistItem2);
         $this->assertTrue(true);
 
         $this->expectException(InvariantException::class);
-        $room->startPlay($user, $playlistItem1, 0);
+        static::roomStartPlay($user, $playlistItem1);
     }
 
     public function testMaxAttemptsForItemReached()
@@ -174,19 +174,19 @@ public function testMaxAttemptsForItemReached()
         ]);
 
         $initialCount = $playlistItem1->scoreTokens()->count();
-        $room->startPlay($user, $playlistItem1, 0);
+        static::roomStartPlay($user, $playlistItem1);
         $this->assertSame($initialCount + 1, $playlistItem1->scoreTokens()->count());
 
         $initialCount = $playlistItem1->scoreTokens()->count();
         try {
-            $room->startPlay($user, $playlistItem1, 0);
+            static::roomStartPlay($user, $playlistItem1);
         } catch (Exception $ex) {
             $this->assertTrue($ex instanceof InvariantException);
         }
         $this->assertSame($initialCount, $playlistItem1->scoreTokens()->count());
 
         $initialCount = $playlistItem2->scoreTokens()->count();
-        $room->startPlay($user, $playlistItem2, 0);
+        static::roomStartPlay($user, $playlistItem2);
         $this->assertSame($initialCount + 1, $playlistItem2->scoreTokens()->count());
     }
 
diff --git a/tests/Models/Multiplayer/UserScoreAggregateTest.php b/tests/Models/Multiplayer/UserScoreAggregateTest.php
index 710e5d52399..8ab32f33a75 100644
--- a/tests/Models/Multiplayer/UserScoreAggregateTest.php
+++ b/tests/Models/Multiplayer/UserScoreAggregateTest.php
@@ -173,7 +173,7 @@ public function testStartingPlayIncreasesAttempts(): void
         $user = User::factory()->create();
         $playlistItem = $this->createPlaylistItem();
 
-        $this->room->startPlay($user, $playlistItem, 0);
+        static::roomStartPlay($user, $playlistItem);
         $agg = UserScoreAggregate::new($user, $this->room);
 
         $this->assertSame(1, $agg->attempts);
diff --git a/tests/Models/TeamTest.php b/tests/Models/TeamTest.php
new file mode 100644
index 00000000000..f15d0ef6999
--- /dev/null
+++ b/tests/Models/TeamTest.php
@@ -0,0 +1,32 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace Tests\Models;
+
+use App\Models\Team;
+use App\Models\TeamMember;
+use App\Models\User;
+use Tests\TestCase;
+
+class TeamTest extends TestCase
+{
+    public function testDelete(): void
+    {
+        $team = Team::factory()->create();
+        $team->members()->create(['user_id' => User::factory()->create()->getKey()]);
+        $otherTeam = Team::factory()->create();
+        $otherTeam->members()->create(['user_id' => User::factory()->create()->getKey()]);
+
+        $this->expectCountChange(fn () => Team::count(), -1);
+        $this->expectCountChange(fn () => TeamMember::count(), -2);
+        $this->expectCountChange(fn () => $otherTeam->members()->count(), 0);
+
+        $team->fresh()->delete();
+
+        $this->assertNotNull($otherTeam->fresh());
+    }
+}
diff --git a/tests/Models/UserTest.php b/tests/Models/UserTest.php
index 0367dd3a709..1a623a2d57a 100644
--- a/tests/Models/UserTest.php
+++ b/tests/Models/UserTest.php
@@ -10,11 +10,99 @@
 use App\Libraries\Session\Store;
 use App\Models\OAuth\Token;
 use App\Models\User;
+use App\Models\UsernameChangeHistory;
+use Carbon\CarbonImmutable;
 use Database\Factories\OAuth\RefreshTokenFactory;
 use Tests\TestCase;
 
 class UserTest extends TestCase
 {
+    public static function dataProviderForAttributeTwitter(): array
+    {
+        return [
+            ['@hello', 'hello'],
+            ['hello', 'hello'],
+            ['@', null],
+            ['', null],
+            [null, null],
+        ];
+    }
+
+    public static function dataProviderForUsernameChangeCost()
+    {
+        return [
+            [0, 0],
+            [1, 8],
+            [2, 16],
+            [3, 32],
+            [4, 64],
+            [5, 100],
+            [6, 100],
+            [10, 100],
+        ];
+    }
+
+    public static function dataProviderForUsernameChangeCostLastChange()
+    {
+        // assume there are 6 changes (max tier + 1)
+        return [
+            [0, 100],
+            [1, 64],
+            [2, 32],
+            [3, 16],
+            [4, 8],
+            [5, 8],
+            [6, 8],
+            [10, 8],
+        ];
+    }
+
+    public static function dataProviderForUsernameChangeCostType()
+    {
+        return [
+            ['admin', 0],
+            ['inactive', 0],
+            ['paid', 8],
+            ['revert', 0],
+            ['support', 8],
+        ];
+    }
+
+    public static function dataProviderForUsernameChangeCostTypeLastChange()
+    {
+        return [
+            ['admin', 8],
+            ['inactive', 8],
+            ['paid', 32],
+            ['revert', 8],
+            ['support', 32],
+        ];
+    }
+
+    public static function dataProviderValidDiscordUsername(): array
+    {
+        return [
+            ['username', true],
+            ['user_name', true],
+            ['user.name', true],
+            ['user2name', true],
+            ['u_sernam.e1337', true],
+            ['username#', false],
+            ['u', false],
+            ['morethan32characterinthisusername', false], // 33 characters
+
+            // old format
+            ['username#1337', true],
+            ['ユーザー名#1337', true],
+            ['username#1', false],
+            ['username#13bb', false],
+            ['username#abcd', false],
+            ['user@name#1337', false],
+            ['user#name#1337', false],
+            ['user:name#1337', false],
+        ];
+    }
+
     /**
      * @dataProvider dataProviderForAttributeTwitter
      */
@@ -47,6 +135,26 @@ public function testEmailLoginEnabled()
         $this->assertTrue($user->is(User::findForLogin('test@example.org')));
     }
 
+    public function testResetSessions(): void
+    {
+        $user = User::factory()->create();
+
+        // create session
+        $this->post(route('login'), ['username' => $user->username, 'password' => User::factory()::DEFAULT_PASSWORD]);
+        // sanity check
+        $this->assertNotEmpty(Store::ids($user->getKey()));
+
+        // create token
+        $token = Token::factory()->create(['user_id' => $user, 'revoked' => false]);
+        $refreshToken = (new RefreshTokenFactory())->create(['access_token_id' => $token, 'revoked' => false]);
+
+        $user->resetSessions();
+
+        $this->assertEmpty(Store::ids($user->getKey()));
+        $this->assertTrue($token->fresh()->revoked);
+        $this->assertTrue($refreshToken->fresh()->revoked);
+    }
+
     public function testUsernameAvailableAtForDefaultGroup()
     {
         config_set('osu.user.allowed_rename_groups', ['default']);
@@ -65,24 +173,64 @@ public function testUsernameAvailableAtForNonDefaultGroup()
         $this->assertGreaterThanOrEqual($allowedAt, $user->getUsernameAvailableAt());
     }
 
-    public function testResetSessions(): void
+    /**
+     * @dataProvider dataProviderForUsernameChangeCost
+     */
+    public function testUsernameChangeCost(int $changes, int $cost)
     {
-        $user = User::factory()->create();
+        $user = User::factory()
+            ->has(UsernameChangeHistory::factory()->count($changes))
+            ->create();
 
-        // create session
-        $this->post(route('login'), ['username' => $user->username, 'password' => User::factory()::DEFAULT_PASSWORD]);
-        // sanity check
-        $this->assertNotEmpty(Store::ids($user->getKey()));
+        $this->assertSame($cost, $user->usernameChangeCost());
+    }
 
-        // create token
-        $token = Token::factory()->create(['user_id' => $user, 'revoked' => false]);
-        $refreshToken = (new RefreshTokenFactory())->create(['access_token_id' => $token, 'revoked' => false]);
+    /**
+     * @dataProvider dataProviderForUsernameChangeCostLastChange
+     */
+    public function testUsernameChangeCostLastChange(int $years, int $cost)
+    {
+        $this->travelTo(CarbonImmutable::now()->subYears($years));
 
-        $user->resetSessions();
+        $user = User::factory()
+            ->has(UsernameChangeHistory::factory()->count(6)) // 6 = max tier + 1
+            ->create();
 
-        $this->assertEmpty(Store::ids($user->getKey()));
-        $this->assertTrue($token->fresh()->revoked);
-        $this->assertTrue($refreshToken->fresh()->revoked);
+        $this->travelBack();
+
+        $this->assertSame($cost, $user->usernameChangeCost());
+    }
+
+    /**
+     * @dataProvider dataProviderForUsernameChangeCostType
+     */
+    public function testUsernameChangeCostType(string $type, int $cost)
+    {
+        $user = User::factory()
+            ->has(UsernameChangeHistory::factory()->state(['type' => $type]))
+            ->create();
+
+        $this->assertSame($cost, $user->usernameChangeCost());
+    }
+
+    /**
+     * This tests the correct last UsernameChangeHistory is used when applying the cost changes.
+     *
+     * @dataProvider dataProviderForUsernameChangeCostTypeLastChange
+     */
+    public function testUsernameChangeCostTypeLastChange(string $type, int $cost)
+    {
+        $this->travelTo(CarbonImmutable::now()->subYears(1));
+
+        $user = User::factory()
+            ->has(UsernameChangeHistory::factory()->count(2))
+            ->create();
+
+        $this->travelBack();
+
+        UsernameChangeHistory::factory()->state(['type' => $type, 'user_id' => $user])->create();
+
+        $this->assertSame($cost, $user->usernameChangeCost());
     }
 
     /**
@@ -99,39 +247,4 @@ public function testValidDiscordUsername(string $username, bool $valid)
             $this->assertArrayHasKey('user_discord', $user->validationErrors()->all());
         }
     }
-
-    public static function dataProviderForAttributeTwitter(): array
-    {
-        return [
-            ['@hello', 'hello'],
-            ['hello', 'hello'],
-            ['@', null],
-            ['', null],
-            [null, null],
-        ];
-    }
-
-    public static function dataProviderValidDiscordUsername(): array
-    {
-        return [
-            ['username', true],
-            ['user_name', true],
-            ['user.name', true],
-            ['user2name', true],
-            ['u_sernam.e1337', true],
-            ['username#', false],
-            ['u', false],
-            ['morethan32characterinthisusername', false], // 33 characters
-
-            // old format
-            ['username#1337', true],
-            ['ユーザー名#1337', true],
-            ['username#1', false],
-            ['username#13bb', false],
-            ['username#abcd', false],
-            ['user@name#1337', false],
-            ['user#name#1337', false],
-            ['user:name#1337', false],
-        ];
-    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 03c9ada27fe..130800a839b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -16,6 +16,7 @@
 use App\Models\Multiplayer\PlaylistItem;
 use App\Models\Multiplayer\ScoreLink;
 use App\Models\OAuth\Client;
+use App\Models\ScoreToken;
 use App\Models\User;
 use Artisan;
 use Carbon\CarbonInterface;
@@ -111,7 +112,7 @@ protected static function resetAppDb(DatabaseManager $database): void
     protected static function roomAddPlay(User $user, PlaylistItem $playlistItem, array $scoreParams): ScoreLink
     {
         return $playlistItem->room->completePlay(
-            $playlistItem->room->startPlay($user, $playlistItem, 0),
+            static::roomStartPlay($user, $playlistItem),
             [
                 'accuracy' => 0.5,
                 'beatmap_id' => $playlistItem->beatmap_id,
@@ -126,6 +127,14 @@ protected static function roomAddPlay(User $user, PlaylistItem $playlistItem, ar
         );
     }
 
+    protected static function roomStartPlay(User $user, PlaylistItem $playlistItem): ScoreToken
+    {
+        return $playlistItem->room->startPlay($user, $playlistItem, [
+            'beatmap_hash' => $playlistItem->beatmap->checksum,
+            'build_id' => 0,
+        ]);
+    }
+
     protected function setUp(): void
     {
         $this->beforeApplicationDestroyed(fn () => $this->runExpectedCountsCallbacks());
@@ -135,6 +144,11 @@ protected function setUp(): void
         // change config setting because we need more than 1 for the tests.
         config_set('osu.oauth.max_user_clients', 100);
 
+        // Disable caching for the BeatmapTagsController and TagsController tests
+        // because otherwise multiple run of the tests may use stale cache data.
+        config_set('osu.tags.beatmap_tags_cache_duration', 0);
+        config_set('osu.tags.tags_cache_duration', 0);
+
         // Force connections to reset even if transactional tests were not used.
         // Should fix tests going wonky when different queue drivers are used, or anything that
         // breaks assumptions of object destructor timing.
@@ -360,11 +374,20 @@ protected function runFakeQueue()
         $this->invokeSetProperty(app('queue'), 'jobs', []);
     }
 
-    protected function withInterOpHeader($url)
+    protected function withInterOpHeader($url, ?callable $callback = null)
     {
-        return $this->withHeaders([
-            'X-LIO-Signature' => hash_hmac('sha1', $url, $GLOBALS['cfg']['osu']['legacy']['shared_interop_secret']),
+        if ($callback === null) {
+            $timestampedUrl = $url;
+        } else {
+            $connector = strpos($url, '?') === false ? '?' : '&';
+            $timestampedUrl = $url.$connector.'timestamp='.time();
+        }
+
+        $this->withHeaders([
+            'X-LIO-Signature' => hash_hmac('sha1', $timestampedUrl, $GLOBALS['cfg']['osu']['legacy']['shared_interop_secret']),
         ]);
+
+        return $callback === null ? $this : $callback($timestampedUrl);
     }
 
     protected function withPersistentSession(SessionStore $session): static
diff --git a/tests/api_routes.json b/tests/api_routes.json
index 2fa56e80652..007f537198f 100644
--- a/tests/api_routes.json
+++ b/tests/api_routes.json
@@ -173,22 +173,6 @@
         ],
         "scopes": []
     },
-    {
-        "uri": "api/v2/beatmaps/{beatmap}/tags",
-        "methods": [
-            "GET",
-            "HEAD"
-        ],
-        "controller": "App\\Http\\Controllers\\BeatmapTagsController@index",
-        "middlewares": [
-            "App\\Http\\Middleware\\ThrottleRequests:1200,1,api:",
-            "App\\Http\\Middleware\\RequireScopes",
-            "App\\Http\\Middleware\\RequireScopes:public"
-        ],
-        "scopes": [
-            "public"
-        ]
-    },
     {
         "uri": "api/v2/beatmaps/{beatmap}/tags",
         "methods": [
@@ -1080,6 +1064,22 @@
             "public"
         ]
     },
+    {
+        "uri": "api/v2/scores",
+        "methods": [
+            "GET",
+            "HEAD"
+        ],
+        "controller": "App\\Http\\Controllers\\ScoresController@index",
+        "middlewares": [
+            "App\\Http\\Middleware\\ThrottleRequests:1200,1,api:",
+            "App\\Http\\Middleware\\RequireScopes",
+            "App\\Http\\Middleware\\RequireScopes:public"
+        ],
+        "scopes": [
+            "public"
+        ]
+    },
     {
         "uri": "api/v2/beatmapsets/search",
         "methods": [
diff --git a/tsconfig.json b/tsconfig.json
index 30a6635ec83..8529796a5c6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,13 @@
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
     "target": "es2015",
+    "types": [
+      "cloudflare-turnstile",
+      "jquery.fileupload",
+      "jquery.scrollto",
+      "jqueryui",
+      "timeago"
+    ],
     "useDefineForClassFields": true
   },
   "include": [
diff --git a/webpack.config.js b/webpack.config.js
index 7d6c8874b82..5c9593eb7bf 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -94,7 +94,7 @@ const plugins = [
     ReactDOM: 'react-dom',
   }),
   new webpack.DefinePlugin({
-    'process.env.DOCS_URL': JSON.stringify(process.env.DOCS_URL || 'https://docs.ppy.sh'),
+    docsUrl: JSON.stringify(process.env.DOCS_URL ?? 'https://docs.ppy.sh'),
   }),
   new webpack.IgnorePlugin({
     // don't add moment locales to bundle.
diff --git a/yarn.lock b/yarn.lock
index c4ddbd845df..77aed7d8357 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4111,7 +4111,7 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-iconv-lite@0.6:
+iconv-lite@0.6, iconv-lite@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
@@ -5102,20 +5102,21 @@ less-loader@^11.1.3:
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-11.1.3.tgz#1bb62d6ca9bf00a177c02793b54baac40f9be694"
   integrity sha512-A5b7O8dH9xpxvkosNrP0dFp2i/dISOJa9WwGF3WJflfqIERE2ybxh1BFDj5CovC2+jCE4M354mk90hN6ziXlVw==
 
-less@^3.9.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909"
-  integrity sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==
+less@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.2.1.tgz#fe4c9848525ab44614c0cf2c00abd8d031bb619a"
+  integrity sha512-CasaJidTIhWmjcqv0Uj5vccMI7pJgfD9lMkKtlnTHAdJdYK/7l8pM9tumLyJ0zhbD4KJLo/YvTj+xznQd5NBhg==
   dependencies:
     copy-anything "^2.0.1"
-    tslib "^1.10.0"
+    parse-node-version "^1.0.1"
+    tslib "^2.3.0"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
     image-size "~0.5.0"
     make-dir "^2.1.0"
     mime "^1.4.1"
-    native-request "^1.0.5"
+    needle "^3.1.0"
     source-map "~0.6.0"
 
 levn@^0.4.1:
@@ -5805,9 +5806,9 @@ ms@^2.1.1, ms@^2.1.3:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.3.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -5826,11 +5827,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-native-request@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
-  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
-
 natural-compare-lite@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
@@ -5841,6 +5837,14 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+needle@^3.1.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"
+  integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==
+  dependencies:
+    iconv-lite "^0.6.3"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6189,6 +6193,11 @@ parse-json@^5.0.0, parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
+parse-node-version@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
+
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -7072,6 +7081,11 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sax@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
+
 scheduler@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
@@ -7605,7 +7619,7 @@ string_decoder@^1.1.1, string_decoder@^1.3.0:
   dependencies:
     safe-buffer "~5.2.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -7626,13 +7640,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -7888,12 +7895,12 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.8.1:
+tslib@^1.8.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.6.2:
+tslib@^2.3.0, tslib@^2.6.2:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
   integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -8397,7 +8404,7 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -8414,15 +8421,6 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"