diff --git a/resources/views/admin/customize.tpl b/resources/views/admin/customize.tpl
index 7c66899d..d4f218cf 100644
--- a/resources/views/admin/customize.tpl
+++ b/resources/views/admin/customize.tpl
@@ -13,7 +13,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.customize') }}
+            @lang('general.customize')
         </h1>
     </section>
 
@@ -24,7 +24,7 @@
             <div class="col-md-3">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('admin.customize.change-color.title') }}</h3>
+                        <h3 class="box-title">@lang('admin.customize.change-color.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body no-padding">
                         <table id="layout-skins-list" class="table table-striped bring-up nth-2-center">
@@ -32,7 +32,7 @@
                                 @foreach(['blue', 'yellow', 'green', 'purple', 'red', 'black'] as $color)
                                     @foreach([$color, "$color-light"] as $innerColor)
                                     <tr>
-                                        <td>{{ trans("admin.customize.colors.$innerColor") }}</td>
+                                        <td>@lang("admin.customize.colors.$innerColor")</td>
                                         <td><a href="#" data-skin="skin-{{ $innerColor }}" class="btn bg-{{ $color }} btn-xs"><i class="fa fa-eye"></i></a></td>
                                     </tr>
                                     @endforeach
@@ -41,7 +41,7 @@
                         </table>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button id="color-submit" class="btn btn-primary">{{ trans('general.submit') }}</button>
+                        <button id="color-submit" class="btn btn-primary">@lang('general.submit')</button>
                     </div>
                 </div><!-- /.box -->
 
diff --git a/resources/views/admin/index.tpl b/resources/views/admin/index.tpl
index 1cfa2e16..c8c773a4 100644
--- a/resources/views/admin/index.tpl
+++ b/resources/views/admin/index.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.dashboard') }}
+            @lang('general.dashboard')
         </h1>
     </section>
 
@@ -24,7 +24,7 @@
                             <a href="{{ url('admin/users') }}">
                                 <span class="info-box-icon bg-aqua"><i class="fa fa-users"></i></span>
                                 <div class="info-box-content">
-                                    <span class="info-box-text">{{ trans('admin.index.total-users') }}</span>
+                                    <span class="info-box-text">@lang('admin.index.total-users')</span>
                                     <span class="info-box-number">{{ App\Models\User::count() }}</span>
                                 </div><!-- /.info-box-content -->
                             </a>
@@ -36,7 +36,7 @@
                             <a href="{{ url('admin/players') }}">
                                 <span class="info-box-icon bg-green"><i class="fa fa-gamepad"></i></span>
                                 <div class="info-box-content">
-                                    <span class="info-box-text">{{ trans('admin.index.total-players') }}</span>
+                                    <span class="info-box-text">@lang('admin.index.total-players')</span>
                                     <span class="info-box-number">{{ App\Models\Player::count() }}</span>
                                 </div><!-- /.info-box-content -->
                             </a>
@@ -47,7 +47,7 @@
                 <div class="info-box">
                     <span class="info-box-icon bg-aqua" style="background-color: #605ca8 !important;"><i class="fa fa-files-o"></i></span>
                     <div class="info-box-content">
-                        <span class="info-box-text">{{ trans('admin.index.total-textures') }}</span>
+                        <span class="info-box-text">@lang('admin.index.total-textures')</span>
                         <span class="info-box-number">{{ App\Models\Texture::count() }}</span>
                     </div><!-- /.info-box-content -->
                 </div><!-- /.info-box -->
@@ -55,7 +55,7 @@
                 <div class="info-box">
                     <span class="info-box-icon bg-yellow"><i class="fa fa-hdd-o"></i></span>
                     <div class="info-box-content">
-                        <span class="info-box-text">{{ trans('admin.index.disk-usage') }}</span>
+                        <span class="info-box-text">@lang('admin.index.disk-usage')</span>
                         <?php $size = DB::table('textures')->sum('size') ?: 0; ?>
                         <span class="info-box-number">{{ $size > 1024 ? round($size / 1024, 1)."MB" : $size."KB" }}</span>
                     </div><!-- /.info-box-content -->
@@ -64,7 +64,7 @@
             <div class="col-md-6">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('admin.index.overview') }}</h3>
+                        <h3 class="box-title">@lang('admin.index.overview')</h3>
                         <div class="box-tools pull-right">
                             <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
                             <button class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
diff --git a/resources/views/admin/master.tpl b/resources/views/admin/master.tpl
index 6583417b..ddeecbea 100644
--- a/resources/views/admin/master.tpl
+++ b/resources/views/admin/master.tpl
@@ -64,11 +64,11 @@
 
                 <!-- Sidebar Menu -->
                 <ul class="sidebar-menu tree" data-widget="tree">
-                    <li class="header">{{ trans('general.admin-panel') }}</li>
+                    <li class="header">@lang('general.admin-panel')</li>
                     {!! bs_menu('admin') !!}
 
-                    <li class="header">{{ trans('general.back') }}</li>
-                    <li><a href="{{ url('user') }}"><i class="fa fa-user"></i> <span>{{ trans('general.user-center') }}</span></a></li>
+                    <li class="header">@lang('general.back')</li>
+                    <li><a href="{{ url('user') }}"><i class="fa fa-user"></i> <span>@lang('general.user-center')</span></a></li>
                 </ul><!-- /.sidebar-menu -->
             </section>
             <!-- /.sidebar -->
diff --git a/resources/views/admin/options.tpl b/resources/views/admin/options.tpl
index 5eba9488..1d75f54d 100644
--- a/resources/views/admin/options.tpl
+++ b/resources/views/admin/options.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.options') }}
+            @lang('general.options')
         </h1>
     </section>
 
diff --git a/resources/views/admin/players.tpl b/resources/views/admin/players.tpl
index 997db1ea..6febe8aa 100644
--- a/resources/views/admin/players.tpl
+++ b/resources/views/admin/players.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.player-manage') }}
+            @lang('general.player-manage')
         </h1>
     </section>
 
@@ -20,13 +20,13 @@
                 <table id="player-table" class="table table-hover">
                     <thead>
                         <tr>
-                            <th>{{ trans('general.player.pid') }}</th>
-                            <th>{{ trans('general.player.owner') }}</th>
-                            <th>{{ trans('general.player.player-name') }}</th>
-                            <th>{{ trans('general.player.preference') }}</th>
-                            <th>{{ trans('general.player.previews') }}</th>
-                            <th>{{ trans('general.player.last-modified') }}</th>
-                            <th>{{ trans('general.operations') }}</th>
+                            <th>@lang('general.player.pid')</th>
+                            <th>@lang('general.player.owner')</th>
+                            <th>@lang('general.player.player-name')</th>
+                            <th>@lang('general.player.preference')</th>
+                            <th>@lang('general.player.previews')</th>
+                            <th>@lang('general.player.last-modified')</th>
+                            <th>@lang('general.operations')</th>
                         </tr>
                     </thead>
                 </table>
diff --git a/resources/views/admin/plugins.tpl b/resources/views/admin/plugins.tpl
index 55f9b11a..e08bedee 100644
--- a/resources/views/admin/plugins.tpl
+++ b/resources/views/admin/plugins.tpl
@@ -13,7 +13,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.plugin-manage') }}
+            @lang('general.plugin-manage')
         </h1>
     </section>
 
@@ -31,13 +31,13 @@
                 <table id="plugin-table" class="table table-hover">
                     <thead>
                         <tr>
-                            <th>{{ trans('admin.plugins.name') }}</th>
-                            <th>{{ trans('admin.plugins.description') }}</th>
-                            <th>{{ trans('admin.plugins.author') }}</th>
-                            <th>{{ trans('admin.plugins.version') }}</th>
-                            <th>{{ trans('admin.plugins.dependencies') }}</th>
-                            <th>{{ trans('admin.plugins.status.title') }}</th>
-                            <th>{{ trans('admin.plugins.operations.title') }}</th>
+                            <th>@lang('admin.plugins.name')</th>
+                            <th>@lang('admin.plugins.description')</th>
+                            <th>@lang('admin.plugins.author')</th>
+                            <th>@lang('admin.plugins.version')</th>
+                            <th>@lang('admin.plugins.dependencies')</th>
+                            <th>@lang('admin.plugins.status.title')</th>
+                            <th>@lang('admin.plugins.operations.title')</th>
                         </tr>
                     </thead>
                 </table>
diff --git a/resources/views/admin/score.tpl b/resources/views/admin/score.tpl
index 4980a50b..bfe30961 100644
--- a/resources/views/admin/score.tpl
+++ b/resources/views/admin/score.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.score-options') }}
+            @lang('general.score-options')
         </h1>
     </section>
 
diff --git a/resources/views/admin/update.tpl b/resources/views/admin/update.tpl
index 718a84c1..4cbf4c01 100644
--- a/resources/views/admin/update.tpl
+++ b/resources/views/admin/update.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.check-update') }}
+            @lang('general.check-update')
         </h1>
     </section>
 
@@ -19,67 +19,67 @@
             <div class="col-md-6">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('admin.update.info.title') }}</h3>
+                        <h3 class="box-title">@lang('admin.update.info.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         @if ($info['new_version_available'])
-                        <div class="callout callout-info">{{ trans('admin.update.info.available') }}</div>
+                        <div class="callout callout-info">@lang('admin.update.info.available')</div>
                         <table class="table">
                             <tbody>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.versions.latest') }}</td>
+                                    <td class="key">@lang('admin.update.info.versions.latest')</td>
                                     <td class="value">
                                         v{{ $info['latest_version'] }}
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.versions.current') }}</td>
+                                    <td class="key">@lang('admin.update.info.versions.current')</td>
                                     <td class="value">
                                         v{{ $info['current_version'] }}
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.release-time') }}</td>
+                                    <td class="key">@lang('admin.update.info.release-time')</td>
                                     <td class="value">
                                         {{ Utils::getTimeFormatted($info['release_time']) }}
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.change-log.text') }}</td>
+                                    <td class="key">@lang('admin.update.info.change-log.text')</td>
                                     <td class="value">
                                         {!! nl2br($info['release_note']) ?: trans('admin.update.info.change-log.empty') !!}
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.downloads.text') }}</td>
+                                    <td class="key">@lang('admin.update.info.downloads.text')</td>
                                     <td class="value">
-                                    <a href="{!! $info['release_url'] !!}">{{ trans('admin.update.info.downloads.link') }}</a>
+                                    <a href="{!! $info['release_url'] !!}">@lang('admin.update.info.downloads.link')</a>
                                     </td>
                                 </tr>
 
                                 @if($info['pre_release'])
-                                <div class="callout callout-warning">{{ trans('admin.update.info.pre-release-warning') }}</div>
+                                <div class="callout callout-warning">@lang('admin.update.info.pre-release-warning')</div>
                                 @endif
 
                             </tbody>
                         </table>
                         @else
-                        <div class="callout callout-success">{{ trans('admin.update.info.up-to-date') }}</div>
+                        <div class="callout callout-success">@lang('admin.update.info.up-to-date')</div>
                         <table class="table">
                             <tbody>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.versions.current') }}</td>
+                                    <td class="key">@lang('admin.update.info.versions.current')</td>
                                     <td class="value">
                                         v{{ $info['current_version'] }}
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td class="key">{{ trans('admin.update.info.release-time') }}</td>
+                                    <td class="key">@lang('admin.update.info.release-time')</td>
                                     <td class="value">
                                         @if ($info['release_time'])
                                         {{ Utils::getTimeFormatted($info['release_time']) }}
                                         @else
-                                        {{ trans('admin.update.info.pre-release') }}
+                                        @lang('admin.update.info.pre-release')
                                         @endif
                                     </td>
                                 </tr>
@@ -88,14 +88,14 @@
                         @endif
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <a class="btn btn-primary" id="update-button" {!! !$info['new_version_available'] ? 'disabled="disabled"' : 'onclick="downloadUpdates();"' !!}>{{ trans('admin.update.info.button') }}</a>
+                        <a class="btn btn-primary" id="update-button" {!! !$info['new_version_available'] ? 'disabled="disabled"' : 'onclick="downloadUpdates();"' !!}>@lang('admin.update.info.button')</a>
                         {!! trans('admin.update.info.check-github', ['url' => 'https://github.com/printempw/blessing-skin-server/releases']) !!}
                     </div>
                 </div>
 
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('admin.update.cautions.title') }}</h3>
+                        <h3 class="box-title">@lang('admin.update.cautions.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         <p>{!! nl2br(trans('admin.update.cautions.text')) !!}</p>
@@ -116,10 +116,10 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ trans('admin.update.download.downloading') }}</h4>
+                <h4 class="modal-title">@lang('admin.update.download.downloading')</h4>
             </div>
             <div class="modal-body">
-                <p>{{ trans('admin.update.download.size') }}<span id="file-size">0</span> Bytes</p>
+                <p>@lang('admin.update.download.size')<span id="file-size">0</span> Bytes</p>
                 <div class="progress">
                     <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%">
                         <span id="imported-progress">0</span>%
diff --git a/resources/views/admin/users.tpl b/resources/views/admin/users.tpl
index 7483e1bd..efdd8ce8 100644
--- a/resources/views/admin/users.tpl
+++ b/resources/views/admin/users.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.user-manage') }}
+            @lang('general.user-manage')
         </h1>
     </section>
 
@@ -20,14 +20,14 @@
                 <table id="user-table" class="table table-hover">
                     <thead>
                         <tr>
-                            <th>{{ trans('general.user.uid') }}</th>
-                            <th>{{ trans('general.user.email') }}</th>
-                            <th>{{ trans('general.user.nickname') }}</th>
-                            <th>{{ trans('general.user.score') }}</th>
-                            <th>{{ trans('admin.users.players-count.title') }}</th>
-                            <th>{{ trans('admin.users.status.title') }}</th>
-                            <th>{{ trans('general.user.register-at') }}</th>
-                            <th>{{ trans('general.operations') }}</th>
+                            <th>@lang('general.user.uid')</th>
+                            <th>@lang('general.user.email')</th>
+                            <th>@lang('general.user.nickname')</th>
+                            <th>@lang('general.user.score')</th>
+                            <th>@lang('admin.users.players-count.title')</th>
+                            <th>@lang('admin.users.status.title')</th>
+                            <th>@lang('general.user.register-at')</th>
+                            <th>@lang('general.operations')</th>
                         </tr>
                     </thead>
                 </table>
diff --git a/resources/views/auth/bind.tpl b/resources/views/auth/bind.tpl
index def4e7aa..730570c6 100644
--- a/resources/views/auth/bind.tpl
+++ b/resources/views/auth/bind.tpl
@@ -10,15 +10,15 @@
     </div>
     <!-- /.login-logo -->
     <div class="login-box-body">
-        <p class="login-box-msg">{{ trans('auth.bind.message') }}</p>
+        <p class="login-box-msg">@lang('auth.bind.message')</p>
 
         <form  method="post" id="login-form">
             <div class="form-group has-feedback">
-                <input name="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
+                <input name="email" type="email" class="form-control" placeholder="@lang('auth.email')">
                 <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
             </div>
 
-            <p>{{ trans('auth.bind.introduction') }}</p>
+            <p>@lang('auth.bind.introduction')</p>
 
             @if (isset($msg))
             <div id="msg" class="callout callout-warning">{{ $msg }}</div>
@@ -27,7 +27,7 @@
             <div class="row">
                 <div class="col-xs-8"></div>
                 <div class="col-xs-4">
-                    <button type="submit" class="btn btn-primary btn-block btn-flat">{{ trans('auth.bind.button') }}</button>
+                    <button type="submit" class="btn btn-primary btn-block btn-flat">@lang('auth.bind.button')</button>
                 </div><!-- /.col -->
             </div>
         </form>
diff --git a/resources/views/auth/forgot.tpl b/resources/views/auth/forgot.tpl
index e6c53fa8..2bb26777 100644
--- a/resources/views/auth/forgot.tpl
+++ b/resources/views/auth/forgot.tpl
@@ -10,7 +10,7 @@
     </div>
     <!-- /.login-logo -->
     <div class="login-box-body">
-        <p class="login-box-msg">{{ trans('auth.forgot.message') }}</p>
+        <p class="login-box-msg">@lang('auth.forgot.message')</p>
 
         @if (Session::has('msg'))
         <div class="callout callout-warning">{{ Session::pull('msg') }}</div>
@@ -18,19 +18,19 @@
 
         <form id="login-form">
             <div class="form-group has-feedback">
-                <input id="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
+                <input id="email" type="email" class="form-control" placeholder="@lang('auth.email')">
                 <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
             </div>
 
             <div class="row" id="captcha-form">
                 <div class="col-xs-8">
                     <div class="form-group has-feedback">
-                        <input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
+                        <input id="captcha" type="text" class="form-control" placeholder="@lang('auth.captcha')">
                     </div>
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
+                    <img class="pull-right captcha" src="{{ url('auth/captcha') }}" alt="CAPTCHA" title="@lang('auth.change-captcha')" data-placement="top" data-toggle="tooltip">
                 </div>
                 <!-- /.col -->
             </div>
@@ -39,11 +39,11 @@
 
             <div class="row">
                 <div class="col-xs-8">
-                    <a href="{{ url('auth/login') }}" class="text-center">{{ trans('auth.forgot.login-link') }}</a>
+                    <a href="{{ url('auth/login') }}" class="text-center">@lang('auth.forgot.login-link')</a>
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <button id="forgot-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.forgot.button') }}</button>
+                    <button id="forgot-button" class="btn btn-primary btn-block btn-flat">@lang('auth.forgot.button')</button>
                 </div>
                 <!-- /.col -->
             </div>
diff --git a/resources/views/auth/login.tpl b/resources/views/auth/login.tpl
index bb12ce17..1ef063e1 100644
--- a/resources/views/auth/login.tpl
+++ b/resources/views/auth/login.tpl
@@ -10,7 +10,7 @@
     </div>
     <!-- /.login-logo -->
     <div class="login-box-body">
-        <p class="login-box-msg">{{ trans('auth.login.message') }}</p>
+        <p class="login-box-msg">@lang('auth.login.message')</p>
 
         @if (Session::has('msg'))
         <div class="callout callout-warning">{{ Session::pull('msg') }}</div>
@@ -18,23 +18,23 @@
 
         <form id="login-form">
             <div class="form-group has-feedback">
-                <input id="identification" type="email" class="form-control" placeholder="{{ trans('auth.identification') }}">
+                <input id="identification" type="email" class="form-control" placeholder="@lang('auth.identification')">
                 <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
             </div>
             <div class="form-group has-feedback">
-                <input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
+                <input id="password" type="password" class="form-control" placeholder="@lang('auth.password')">
                 <span class="glyphicon glyphicon-lock form-control-feedback"></span>
             </div>
 
             <div class="row" id="captcha-form" style="{{ (session('login_fails') > 3) ? '' : 'display: none;' }}">
                 <div class="col-xs-8">
                     <div class="form-group has-feedback">
-                        <input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
+                        <input id="captcha" type="text" class="form-control" placeholder="@lang('auth.captcha')">
                     </div>
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <img class="pull-right captcha" src="{{ url('auth/captcha?v='.time()) }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
+                    <img class="pull-right captcha" src="{{ url('auth/captcha?v='.time()) }}" alt="CAPTCHA" title="@lang('auth.change-captcha')" data-placement="top" data-toggle="tooltip">
                 </div>
                 <!-- /.col -->
             </div>
@@ -45,23 +45,23 @@
                 <div class="col-xs-6">
                     <div class="checkbox icheck" style="margin-top: 0;">
                         <label for="keep">
-                            <input id="keep" type="checkbox"> {{ trans('auth.login.keep') }}
+                            <input id="keep" type="checkbox"> @lang('auth.login.keep')
                         </label>
                     </div>
                 </div><!-- /.col -->
                 <div class="col-xs-6">
-                    <a class="pull-right" href="{{ url('auth/forgot') }}">{{ trans('auth.forgot-link') }}</a>
+                    <a class="pull-right" href="{{ url('auth/forgot') }}">@lang('auth.forgot-link')</a>
                 </div><!-- /.col -->
             </div>
 
             <div class="row">
                 <div class="col-xs-12">
-                    <button id="login-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.login.button') }}</button>
+                    <button id="login-button" class="btn btn-primary btn-block btn-flat">@lang('auth.login.button')</button>
                 </div><!-- /.col -->
             </div>
         </form>
         <br>
-        <a href="{{ url('auth/register') }}" class="pull-left" style="margin-top: -10px;">{{ trans('auth.register-link') }}</a>
+        <a href="{{ url('auth/register') }}" class="pull-left" style="margin-top: -10px;">@lang('auth.register-link')</a>
     </div>
     <!-- /.login-box-body -->
 </div>
diff --git a/resources/views/auth/mail.tpl b/resources/views/auth/mail.tpl
index e12cca5a..425d5c03 100644
--- a/resources/views/auth/mail.tpl
+++ b/resources/views/auth/mail.tpl
@@ -8,17 +8,17 @@
         </h1>
         <div style="padding:30px 40px 40px">{!! trans('auth.mail.message', ['sitename' => "<a style='color:#009a61;text-decoration:none' href='".option('site_url')."'>".option_localized('site_name')."</a>"]) !!}<br><br>
             <div style="border-left:5px solid #ddd;padding:0 0 0 24px;color:#888">
-                {{ trans('auth.mail.ignore')  }}
+                @lang('auth.mail.ignore')
             </div>
         </div>
         <div style="background:#eee;border-top:1px solid #ddd;text-align:center;min-height:90px;line-height:90px">
             <a href="{{ $reset_url }}" style="padding:8px 18px;background:#009a61;color:#fff;text-decoration:none;border-radius:3px" target="_blank">
-                {{ trans('auth.mail.reset') }} ➔
+                @lang('auth.mail.reset') ➔
             </a>
         </div>
     </div>
     <div style="padding-top:30px;text-align:center;font-size:12px;color:#999">
-        * {{ trans('auth.mail.notice') }} <br>
+        * @lang('auth.mail.notice') <br>
     </div>
 </center>
 </div>
diff --git a/resources/views/auth/register.tpl b/resources/views/auth/register.tpl
index 74c89403..a9b3929f 100644
--- a/resources/views/auth/register.tpl
+++ b/resources/views/auth/register.tpl
@@ -10,36 +10,36 @@
     </div>
 
     <div class="register-box-body">
-        <p class="login-box-msg">{{ trans('auth.register.message', ['sitename' => option_localized('site_name')]) }}</p>
+        <p class="login-box-msg">@lang('auth.register.message', ['sitename' => option_localized('site_name')])</p>
 
         <form id="register-form">
             <div class="form-group has-feedback">
-                <input id="email" type="email" class="form-control" placeholder="{{ trans('auth.email') }}">
+                <input id="email" type="email" class="form-control" placeholder="@lang('auth.email')">
                 <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
             </div>
             <div class="form-group has-feedback">
-                <input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
+                <input id="password" type="password" class="form-control" placeholder="@lang('auth.password')">
                 <span class="glyphicon glyphicon-lock form-control-feedback"></span>
             </div>
             <div class="form-group has-feedback">
-                <input id="confirm-pwd" type="password" class="form-control" placeholder="{{ trans('auth.register.repeat-pwd') }}">
+                <input id="confirm-pwd" type="password" class="form-control" placeholder="@lang('auth.register.repeat-pwd')">
                 <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
             </div>
 
-            <div class="form-group has-feedback" title="{{ trans('auth.register.nickname-intro') }}" data-placement="top" data-toggle="tooltip">
-                <input id="nickname" type="text" class="form-control" placeholder="{{ trans('auth.nickname') }}">
+            <div class="form-group has-feedback" title="@lang('auth.register.nickname-intro')" data-placement="top" data-toggle="tooltip">
+                <input id="nickname" type="text" class="form-control" placeholder="@lang('auth.nickname')">
                 <span class="glyphicon glyphicon-pencil form-control-feedback"></span>
             </div>
 
             <div class="row">
                 <div class="col-xs-8">
                     <div class="form-group has-feedback">
-                        <input id="captcha" type="text" class="form-control" placeholder="{{ trans('auth.captcha') }}">
+                        <input id="captcha" type="text" class="form-control" placeholder="@lang('auth.captcha')">
                     </div>
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <img class="pull-right captcha" src="{{ url('auth/captcha?v='.time()) }}" alt="CAPTCHA" title="{{ trans('auth.change-captcha') }}" data-placement="top" data-toggle="tooltip">
+                    <img class="pull-right captcha" src="{{ url('auth/captcha?v='.time()) }}" alt="CAPTCHA" title="@lang('auth.change-captcha')" data-placement="top" data-toggle="tooltip">
                 </div>
                 <!-- /.col -->
             </div>
@@ -48,11 +48,11 @@
 
             <div class="row">
                 <div class="col-xs-8">
-                    <a href="{{ url('auth/login') }}" class="text-center">{{ trans('auth.login-link') }}</a>
+                    <a href="{{ url('auth/login') }}" class="text-center">@lang('auth.login-link')</a>
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <button id="register-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.register.button') }}</button>
+                    <button id="register-button" class="btn btn-primary btn-block btn-flat">@lang('auth.register.button')</button>
                 </div>
                 <!-- /.col -->
             </div>
diff --git a/resources/views/auth/reset.tpl b/resources/views/auth/reset.tpl
index 500b81bd..e0bdb145 100644
--- a/resources/views/auth/reset.tpl
+++ b/resources/views/auth/reset.tpl
@@ -10,17 +10,17 @@
     </div>
 
     <div class="login-box-body">
-        <p class="login-box-msg">{{ trans('auth.reset.message', ['username' => $user->getNickName()]) }}</p>
+        <p class="login-box-msg">@lang('auth.reset.message', ['username' => $user->getNickName()])</p>
 
         <form id="login-form">
             <input id="uid" type="hidden" value="{{ $user->uid }}" />
 
             <div class="form-group has-feedback">
-                <input id="password" type="password" class="form-control" placeholder="{{ trans('auth.password') }}">
+                <input id="password" type="password" class="form-control" placeholder="@lang('auth.password')">
                 <span class="glyphicon glyphicon-lock form-control-feedback"></span>
             </div>
             <div class="form-group has-feedback">
-                <input id="confirm-pwd" type="password" class="form-control" placeholder="{{ trans('auth.register.repeat-pwd') }}">
+                <input id="confirm-pwd" type="password" class="form-control" placeholder="@lang('auth.register.repeat-pwd')">
                 <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
             </div>
 
@@ -31,7 +31,7 @@
                 </div>
                 <!-- /.col -->
                 <div class="col-xs-4">
-                    <button id="reset-button" class="btn btn-primary btn-block btn-flat">{{ trans('auth.reset.button') }}</button>
+                    <button id="reset-button" class="btn btn-primary btn-block btn-flat">@lang('auth.reset.button')</button>
                 </div>
                 <!-- /.col -->
             </div>
diff --git a/resources/views/common/manage-panel.tpl b/resources/views/common/manage-panel.tpl
index 1327e856..b1360aa4 100644
--- a/resources/views/common/manage-panel.tpl
+++ b/resources/views/common/manage-panel.tpl
@@ -9,10 +9,10 @@
 
     <div class="box-footer">
         @if ($texture->public == "1")
-        <a onclick="changePrivacy({{ $texture->tid }});" class="btn btn-warning">{{ trans('skinlib.privacy.set-as-private') }}</a>
+        <a onclick="changePrivacy({{ $texture->tid }});" class="btn btn-warning">@lang('skinlib.privacy.set-as-private')</a>
         @else
-        <a onclick="changePrivacy({{ $texture->tid }});" class="btn btn-warning">{{ trans('skinlib.privacy.set-as-public') }}</a>
+        <a onclick="changePrivacy({{ $texture->tid }});" class="btn btn-warning">@lang('skinlib.privacy.set-as-public')</a>
         @endif
-        <a onclick="deleteTexture({{ $texture->tid }});" class="btn btn-danger pull-right">{{ trans('skinlib.show.delete-texture') }}</a>
+        <a onclick="deleteTexture({{ $texture->tid }});" class="btn btn-danger pull-right">@lang('skinlib.show.delete-texture')</a>
     </div><!-- /.box-footer -->
 </div><!-- /.box -->
diff --git a/resources/views/common/texture-preview.tpl b/resources/views/common/texture-preview.tpl
index 6bfc267a..0db9ad1b 100644
--- a/resources/views/common/texture-preview.tpl
+++ b/resources/views/common/texture-preview.tpl
@@ -2,10 +2,10 @@
     <h3 class="box-title" style="width: 100%;">{!! $title or trans('general.texture-preview') !!}
         <span id="textures-indicator" data-toggle="tooltip" title="" class="badge bg-light-blue"></span>
         <div class="operations">
-            <i data-toggle="tooltip" data-placement="bottom" title="{{ trans('general.walk').' / '.trans('general.run') }}" class="fa fa-forward"></i>
-            <i data-toggle="tooltip" data-placement="bottom" title="{{ trans('general.rotation') }}" class="fa fa-repeat"></i>
-            <i data-toggle="tooltip" data-placement="bottom" title="{{ trans('general.pause') }}" class="fa fa-pause"></i>
-            <i data-toggle="tooltip" data-placement="bottom" title="{{ trans('general.reset') }}" class="fa fa-stop"></i>
+            <i data-toggle="tooltip" data-placement="bottom" title="@lang('general.walk').' / '.trans('general.run')" class="fa fa-forward"></i>
+            <i data-toggle="tooltip" data-placement="bottom" title="@lang('general.rotation')" class="fa fa-repeat"></i>
+            <i data-toggle="tooltip" data-placement="bottom" title="@lang('general.pause')" class="fa fa-pause"></i>
+            <i data-toggle="tooltip" data-placement="bottom" title="@lang('general.reset')" class="fa fa-stop"></i>
         </div>
     </h3>
 </div><!-- /.box-header -->
diff --git a/resources/views/common/user-menu.tpl b/resources/views/common/user-menu.tpl
index 907469a3..89acc6d0 100644
--- a/resources/views/common/user-menu.tpl
+++ b/resources/views/common/user-menu.tpl
@@ -23,13 +23,13 @@
         <li class="user-body">
             <div class="row">
                 <div class="col-xs-4 text-center">
-                    <a href="{{ url('admin') }}">{{ trans('general.admin-panel') }}</a>
+                    <a href="{{ url('admin') }}">@lang('general.admin-panel')</a>
                 </div>
                 <div class="col-xs-4 text-center">
-                    <a href="{{ url('admin/users') }}">{{ trans('general.user-manage') }}</a>
+                    <a href="{{ url('admin/users') }}">@lang('general.user-manage')</a>
                 </div>
                 <div class="col-xs-4 text-center">
-                    <a href="{{ url('admin/options') }}">{{ trans('general.options') }}</a>
+                    <a href="{{ url('admin/options') }}">@lang('general.options')</a>
                 </div>
             </div>
         </li>
@@ -38,10 +38,10 @@
         <!-- Menu Footer-->
         <li class="user-footer">
             <div class="pull-left">
-                <a href="{{ url('user') }}" class="btn btn-default btn-flat">{{ trans('general.user-center') }}</a>
+                <a href="{{ url('user') }}" class="btn btn-default btn-flat">@lang('general.user-center')</a>
             </div>
             <div class="pull-right">
-                <button id="logout-button" class="btn btn-default btn-flat">{{ trans('general.logout') }}</button>
+                <button id="logout-button" class="btn btn-default btn-flat">@lang('general.logout')</button>
             </div>
         </li>
     </ul>
diff --git a/resources/views/errors/403.tpl b/resources/views/errors/403.tpl
index ec95becb..4ae982b2 100644
--- a/resources/views/errors/403.tpl
+++ b/resources/views/errors/403.tpl
@@ -7,5 +7,5 @@
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-403')]) }}</p>
+<p>@lang('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-403')])</p>
 @endsection
diff --git a/resources/views/errors/404.tpl b/resources/views/errors/404.tpl
index 61ff5813..78f779be 100644
--- a/resources/views/errors/404.tpl
+++ b/resources/views/errors/404.tpl
@@ -7,5 +7,5 @@
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-404')]) }}</p>
+<p>@lang('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-404')])</p>
 @endsection
diff --git a/resources/views/errors/503.tpl b/resources/views/errors/503.tpl
index 82fdb499..02d4fb1c 100644
--- a/resources/views/errors/503.tpl
+++ b/resources/views/errors/503.tpl
@@ -7,5 +7,5 @@
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-503')]) }}</p>
+<p>@lang('errors.exception.detail', ['msg' => $exception->getMessage() ?: trans('errors.http.msg-503')])</p>
 @endsection
diff --git a/resources/views/errors/exception.tpl b/resources/views/errors/exception.tpl
index 0a0aede4..23167985 100644
--- a/resources/views/errors/exception.tpl
+++ b/resources/views/errors/exception.tpl
@@ -3,7 +3,7 @@
 @section('title', trans('errors.general.title'))
 
 @section('content')
-<h1>{{ trans('errors.general.title') }}
+<h1>@lang('errors.general.title')
 @include('setup.wizard.language')
 </h1>
 
diff --git a/resources/views/errors/pretty.tpl b/resources/views/errors/pretty.tpl
index 567947fc..7b632136 100644
--- a/resources/views/errors/pretty.tpl
+++ b/resources/views/errors/pretty.tpl
@@ -3,10 +3,10 @@
 @section('title', trans('errors.general.title'))
 
 @section('content')
-<h1>{{ trans('errors.general.title') }}
+<h1>@lang('errors.general.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('errors.exception.code', ['code' => $code]) }}</p>
+<p>@lang('errors.exception.code', ['code' => $code])</p>
 <p>{!! trans('errors.exception.detail', ['msg' => $message]) !!}</p>
 @endsection
diff --git a/resources/views/index.tpl b/resources/views/index.tpl
index da2f4e71..2379aab9 100644
--- a/resources/views/index.tpl
+++ b/resources/views/index.tpl
@@ -28,8 +28,8 @@
                     <!-- Collect the nav links, forms, and other content for toggling -->
                     <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
                         <ul class="nav navbar-nav">
-                            <li class="active"><a href="{{ url('/') }}">{{ trans('general.index') }}</a></li>
-                            <li><a href="{{ url('skinlib') }}">{{ trans('general.skinlib') }}</a></li>
+                            <li class="active"><a href="{{ url('/') }}">@lang('general.index')</a></li>
+                            <li><a href="{{ url('skinlib') }}">@lang('general.skinlib')</a></li>
                         </ul>
                     </div><!-- /.navbar-collapse -->
                     <!-- Navbar Right Menu -->
@@ -42,7 +42,7 @@
                             @else {{-- Anonymous User --}}
                             <!-- User Account Menu -->
                             <li class="dropdown user user-menu">
-                                <a href="{{ url('auth/login') }}" class="btn btn-login">{{ trans('general.login') }}</a>
+                                <a href="{{ url('auth/login') }}" class="btn btn-login">@lang('general.login')</a>
                             </li>
                             @endif
                         </ul>
@@ -60,12 +60,12 @@
                 <p>
                     @if (is_null($user))
                         @if (option('user_can_register'))
-                        <a href="{{ url('auth/register') }}" id="btn-register" class="button">{{ trans('general.register') }}</a>
+                        <a href="{{ url('auth/register') }}" id="btn-register" class="button">@lang('general.register')</a>
                         @else
-                        <a href="{{ url('auth/login') }}" id="btn-close-register" class="button">{{ trans('general.login') }}</a>
+                        <a href="{{ url('auth/login') }}" id="btn-close-register" class="button">@lang('general.login')</a>
                         @endif
                     @else
-                    <a href="{{ url('user') }}" class="button">{{ trans('general.user-center') }}</a>
+                    <a href="{{ url('user') }}" class="button">@lang('general.user-center')</a>
                     @endif
                 </p>
             </div>
@@ -81,18 +81,18 @@
                 <br>
                 <div class="col-lg-4">
                     <i class="fa fa-users" aria-hidden="true"></i>
-                    <h3>{{ trans('index.features.multi-player.name') }}</h3>
-                    <p>{{ trans('index.features.multi-player.desc') }}</p>
+                    <h3>@lang('index.features.multi-player.name')</h3>
+                    <p>@lang('index.features.multi-player.desc')</p>
                 </div>
                 <div class="col-lg-4">
                     <i class="fa fa-share-alt" aria-hidden="true"></i>
-                    <h3>{{ trans('index.features.sharing.name') }}</h3>
-                    <p>{{ trans('index.features.sharing.desc') }}</p>
+                    <h3>@lang('index.features.sharing.name')</h3>
+                    <p>@lang('index.features.sharing.desc')</p>
                 </div>
                 <div class="col-lg-4">
                     <i class="fa fa-cloud" aria-hidden="true"></i>
-                    <h3>{{ trans('index.features.free.name') }}</h3>
-                    <p>{{ trans('index.features.free.desc') }}</p>
+                    <h3>@lang('index.features.free.name')</h3>
+                    <p>@lang('index.features.free.desc')</p>
                 </div>
             </div>
             <br>
@@ -102,11 +102,11 @@
     <div id="footerwrap">
         <div class="container">
             <div class="col-lg-6">
-                {{ trans('index.introduction', ['sitename' => option_localized('site_name')]) }}
+                @lang('index.introduction', ['sitename' => option_localized('site_name')])
             </div>
 
             <div class="col-lg-6">
-                <a href="{{ url('auth/register') }}" id="btn-register" class="button">{{ trans('index.start') }}</a>
+                <a href="{{ url('auth/register') }}" id="btn-register" class="button">@lang('index.start')</a>
             </div>
         </div>
     </div>
diff --git a/resources/views/setup/locked.tpl b/resources/views/setup/locked.tpl
index d64f434c..4538377e 100644
--- a/resources/views/setup/locked.tpl
+++ b/resources/views/setup/locked.tpl
@@ -2,12 +2,12 @@
 
 @section('content')
 <h1>
-{{ trans('setup.locked.title') }}
+@lang('setup.locked.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('setup.locked.text') }}</p>
+<p>@lang('setup.locked.text')</p>
 <p class="step">
-    <a href="{{ url('/') }}" class="button button-large">{{ trans('setup.locked.button') }}</a>
+    <a href="{{ url('/') }}" class="button button-large">@lang('setup.locked.button')</a>
 </p>
 @endsection
diff --git a/resources/views/setup/master.tpl b/resources/views/setup/master.tpl
index 3ad6937a..4b9b5664 100644
--- a/resources/views/setup/master.tpl
+++ b/resources/views/setup/master.tpl
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="robots" content="noindex,nofollow" />
-    <title>{{ trans('setup.wizard.master.title') }}</title>
+    <title>@lang('setup.wizard.master.title')</title>
     <link rel="shortcut icon" href="{{ assets('dist/images/favicon.ico') }}">
     <link rel="stylesheet" type="text/css" href="{{ assets('dist/css/install.css') }}">
     @yield('style')
diff --git a/resources/views/setup/updates/master.tpl b/resources/views/setup/updates/master.tpl
index 83f6ac5a..5f7d274a 100644
--- a/resources/views/setup/updates/master.tpl
+++ b/resources/views/setup/updates/master.tpl
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="robots" content="noindex,nofollow" />
-    <title>{{ trans('setup.updates.master.title') }}</title>
+    <title>@lang('setup.updates.master.title')</title>
     <link rel="shortcut icon" href="../resources/assets/dist/images/favicon.ico">
     <link rel="stylesheet" type="text/css" href="../resources/assets/dist/css/install.css">
 </head>
diff --git a/resources/views/setup/updates/success.tpl b/resources/views/setup/updates/success.tpl
index 8d0aeb04..9a889077 100644
--- a/resources/views/setup/updates/success.tpl
+++ b/resources/views/setup/updates/success.tpl
@@ -2,15 +2,15 @@
 
 @section('content')
 <h1>
-{{ trans('setup.updates.success.title') }}
+@lang('setup.updates.success.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('setup.updates.success.text', ['version' => config('app.version')]) }}</p>
+<p>@lang('setup.updates.success.text', ['version' => config('app.version')])</p>
 
 {{-- if any tip is given --}}
 @if (!empty($tips))
-<p><b>{{ trans('setup.updates.success.tips') }}</b></p>
+<p><b>@lang('setup.updates.success.tips')</b></p>
 <ul>
     @foreach ($tips as $tip)
     <li><p>{{ $tip }}</p></li>
@@ -19,6 +19,6 @@
 @endif
 
 <p class="step">
-    <a href="{{ url('/') }}" class="button button-large">{{ trans('general.index') }}</a>
+    <a href="{{ url('/') }}" class="button button-large">@lang('general.index')</a>
 </p>
 @endsection
diff --git a/resources/views/setup/updates/welcome.tpl b/resources/views/setup/updates/welcome.tpl
index 4c9a8b13..abd9da84 100644
--- a/resources/views/setup/updates/welcome.tpl
+++ b/resources/views/setup/updates/welcome.tpl
@@ -2,7 +2,7 @@
 
 @section('content')
 <h1>
-{{ trans('setup.updates.welcome.title') }}
+@lang('setup.updates.welcome.title')
 @include('setup.wizard.language')
 </h1>
 
@@ -10,7 +10,7 @@
 
 <form method="post" action="" novalidate="novalidate">
     <p class="step">
-        <input type="submit" name="submit" class="button button-large" value="{{ trans('setup.updates.welcome.button') }}"  />
+        <input type="submit" name="submit" class="button button-large" value="@lang('setup.updates.welcome.button')"  />
     </p>
 </form>
 @endsection
diff --git a/resources/views/setup/wizard/finish.tpl b/resources/views/setup/wizard/finish.tpl
index d51064a0..25fd0f4f 100644
--- a/resources/views/setup/wizard/finish.tpl
+++ b/resources/views/setup/wizard/finish.tpl
@@ -1,24 +1,24 @@
 @extends('setup.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.finish.title') }}
+<h1>@lang('setup.wizard.finish.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('setup.wizard.finish.text') }}</p>
+<p>@lang('setup.wizard.finish.text')</p>
 
 <table class="form-table install-success">
     <tr>
-        <th>{{ trans('auth.email') }}</th>
+        <th>@lang('auth.email')</th>
         <td>{{ $email }}</td>
     </tr>
     <tr>
-        <th>{{ trans('auth.password') }}</th>
+        <th>@lang('auth.password')</th>
         <td><p><em>{{ $password }}</em></p></td>
     </tr>
 </table>
 
 <p class="step">
-    <a href="../" class="button button-large">{{ trans('general.index') }}</a>
+    <a href="../" class="button button-large">@lang('general.index')</a>
 </p>
 @endsection
diff --git a/resources/views/setup/wizard/info.tpl b/resources/views/setup/wizard/info.tpl
index 6f2f00b1..529befe3 100644
--- a/resources/views/setup/wizard/info.tpl
+++ b/resources/views/setup/wizard/info.tpl
@@ -1,47 +1,47 @@
 @extends('setup.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.info.title') }}
+<h1>@lang('setup.wizard.info.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('setup.wizard.info.text') }}</p>
+<p>@lang('setup.wizard.info.text')</p>
 
 <form id="setup" method="post" action="{{ url('setup/finish') }}" novalidate="novalidate">
     <table class="form-table">
         <tr>
-            <th scope="row"><label for="email">{{ trans('setup.wizard.info.admin-email') }}</label></th>
+            <th scope="row"><label for="email">@lang('setup.wizard.info.admin-email')</label></th>
             <td>
                 <input name="email" type="email" id="email" size="25" value="" />
                 <p>{!! trans('setup.wizard.info.admin-notice') !!}</p>
             </td>
         </tr>
         <tr class="form-field form-required">
-            <th scope="row"><label for="password">{{ trans('setup.wizard.info.password') }}</label></th>
+            <th scope="row"><label for="password">@lang('setup.wizard.info.password')</label></th>
             <td>
                 <input type="password" name="password" id="password" class="regular-text" autocomplete="off" />
                 <p>{!! trans('setup.wizard.info.pwd-notice') !!}</p>
             </td>
         </tr>
         <tr class="form-field form-required">
-            <th scope="row"><label for="password_confirmation">{{ trans('setup.wizard.info.confirm-pwd') }}</label></th>
+            <th scope="row"><label for="password_confirmation">@lang('setup.wizard.info.confirm-pwd')</label></th>
             <td>
                 <input type="password" name="password_confirmation" id="password_confirmation" autocomplete="off" />
             </td>
         </tr>
         <tr>
-            <th scope="row"><label for="site_name">{{ trans('setup.wizard.info.site-name') }}</label></th>
+            <th scope="row"><label for="site_name">@lang('setup.wizard.info.site-name')</label></th>
             <td>
                 <input name="site_name" type="text" id="site_name" size="25" value="{{ config('options.site_name') }}" />
-                <p>{{ trans('setup.wizard.info.site-name-notice') }}</p>
+                <p>@lang('setup.wizard.info.site-name-notice')</p>
             </td>
         </tr>
         <tr>
-            <th scope="row"><label for="generate_random">{{ trans('setup.wizard.info.secure') }}</label></th>
+            <th scope="row"><label for="generate_random">@lang('setup.wizard.info.secure')</label></th>
             <td>
                 <label for="generate_random">
                     <input name="generate_random" type="checkbox" id="generate_random" size="25" value="on" />
-                    {{ trans('setup.wizard.info.secure-notice') }}
+                    @lang('setup.wizard.info.secure-notice')
                 </label>
             </td>
         </tr>
@@ -58,7 +58,7 @@
     @endif
 
     <p class="step">
-        <input type="submit" name="submit" id="submit" class="button button-large" value="{{ trans('setup.wizard.info.button') }}"  />
+        <input type="submit" name="submit" id="submit" class="button button-large" value="@lang('setup.wizard.info.button')"  />
     </p>
 </form>
 @endsection
diff --git a/resources/views/setup/wizard/welcome.tpl b/resources/views/setup/wizard/welcome.tpl
index c7b4b970..ce085b01 100644
--- a/resources/views/setup/wizard/welcome.tpl
+++ b/resources/views/setup/wizard/welcome.tpl
@@ -1,14 +1,14 @@
 @extends('setup.master')
 
 @section('content')
-<h1>{{ trans('setup.wizard.welcome.title') }}
+<h1>@lang('setup.wizard.welcome.title')
 @include('setup.wizard.language')
 </h1>
 
-<p>{{ trans('setup.wizard.welcome.text', ['version' => config('app.version')]) }}</p>
-<p>{{ trans('setup.database.connection-success', ['server' => $server, 'type' => $type]) }}</p>
+<p>@lang('setup.wizard.welcome.text', ['version' => config('app.version')])</p>
+<p>@lang('setup.database.connection-success', ['server' => $server, 'type' => $type])</p>
 
 <p class="step">
-    <a href="{{ url('setup/info') }}" class="button button-large">{{ trans('setup.wizard.welcome.button') }}</a>
+    <a href="{{ url('setup/info') }}" class="button button-large">@lang('setup.wizard.welcome.button')</a>
 </p>
 @endsection
diff --git a/resources/views/skinlib/index.tpl b/resources/views/skinlib/index.tpl
index 63d29af1..1d69a71b 100644
--- a/resources/views/skinlib/index.tpl
+++ b/resources/views/skinlib/index.tpl
@@ -8,11 +8,11 @@
     <div class="container">
         <!-- Content Header (Page header) -->
         <section class="content-header">
-            <h1>{{ trans('general.skinlib') }}
+            <h1>@lang('general.skinlib')
                 <small id="search-indicator"></small>
             </h1>
             <ol class="breadcrumb">
-                <li><i class="fa fa-tags"></i> {{ trans('skinlib.filter.now-showing') }}</li>
+                <li><i class="fa fa-tags"></i> @lang('skinlib.filter.now-showing')</li>
                 <li id="filter-indicator"></li>
                 <li id="uploader-indicator"></li>
                 <li class="active" id="sort-indicator"></li>
@@ -34,7 +34,7 @@
 
                 <div class="overlay">
                     <i class="fa fa-refresh fa-spin"></i>
-                    <span>{{ trans('general.loading') }}</span>
+                    <span>@lang('general.loading')</span>
                 </div>
             </div><!-- /.box -->
         </section><!-- /.content -->
diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl
index 2e620707..d0b72321 100644
--- a/resources/views/skinlib/master.tpl
+++ b/resources/views/skinlib/master.tpl
@@ -32,48 +32,48 @@
                     <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
                         <ul class="nav navbar-nav">
                             <li class="active">
-                                <a href="{{ url('skinlib') }}">{{ trans('general.skinlib') }}</a>
+                                <a href="{{ url('skinlib') }}">@lang('general.skinlib')</a>
                             </li>
                             <li>
-                                <a href="{{ url('user/closet') }}">{{ trans('general.my-closet') }}</a>
+                                <a href="{{ url('user/closet') }}">@lang('general.my-closet')</a>
                             </li>
 
                             @unless (isset($with_out_filter))
                             <!-- Filters -->
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                    <i class="fa fa-filter" aria-hidden="true"></i> {{ trans('skinlib.general.filter') }} <span class="caret"></span>
+                                    <i class="fa fa-filter" aria-hidden="true"></i> @lang('skinlib.general.filter') <span class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li><a class="filter" data-filter="skin" href="#">{{ trans('general.skin') }} <small>{{ trans('skinlib.filter.any-model') }}</small></a></li>
+                                    <li><a class="filter" data-filter="skin" href="#">@lang('general.skin') <small>@lang('skinlib.filter.any-model')</small></a></li>
 
-                                    <li><a class="filter" data-filter="steve" href="#">{{ trans('general.skin') }} <small>{{ trans('skinlib.filter.steve-model') }}</small></a></li>
+                                    <li><a class="filter" data-filter="steve" href="#">@lang('general.skin') <small>@lang('skinlib.filter.steve-model')</small></a></li>
 
-                                    <li><a class="filter" data-filter="alex" href="#">{{ trans('general.skin') }} <small>{{ trans('skinlib.filter.alex-model') }}</small></a></li>
+                                    <li><a class="filter" data-filter="alex" href="#">@lang('general.skin') <small>@lang('skinlib.filter.alex-model')</small></a></li>
 
                                     <li class="divider"></li>
 
-                                    <li><a class="filter" data-filter="cape" href="#">{{ trans('general.cape') }}</a></li>
+                                    <li><a class="filter" data-filter="cape" href="#">@lang('general.cape')</a></li>
 
                                     @if (!is_null($user))
                                     <li class="divider"></li>
-                                    <li><a class="filter" data-filter="uploader" data-uid="{{ $user->uid }}" href="#">{{ trans('skinlib.general.my-upload') }}</a></li>
+                                    <li><a class="filter" data-filter="uploader" data-uid="{{ $user->uid }}" href="#">@lang('skinlib.general.my-upload')</a></li>
                                     @endif
 
                                     <li class="divider"></li>
-                                    <li><a href="{{ url('skinlib') }}">{{ trans('skinlib.filter.clean-filter') }}</a></li>
+                                    <li><a href="{{ url('skinlib') }}">@lang('skinlib.filter.clean-filter')</a></li>
                                 </ul>
                             </li>
 
                             <!-- Sort -->
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                    <i class="fa fa-sort-amount-desc" aria-hidden="true"></i> {{ trans('skinlib.general.sort') }} <span class="caret"></span>
+                                    <i class="fa fa-sort-amount-desc" aria-hidden="true"></i> @lang('skinlib.general.sort') <span class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu" role="menu">
-                                    <li><a class="sort" data-sort="likes" href="#">{{ trans('skinlib.sort.most-likes') }}</a></li>
+                                    <li><a class="sort" data-sort="likes" href="#">@lang('skinlib.sort.most-likes')</a></li>
                                     <li class="divider"></li>
-                                    <li><a class="sort" data-sort="time" href="#">{{ trans('skinlib.sort.newest-uploaded') }}</a></li>
+                                    <li><a class="sort" data-sort="time" href="#">@lang('skinlib.sort.newest-uploaded')</a></li>
                                 </ul>
                             </li>
                             @endunless
@@ -82,7 +82,7 @@
                         @unless (isset($with_out_filter))
                         <form class="navbar-form navbar-left" id="search-form" role="search">
                             <div class="form-group">
-                                <input type="text" class="form-control" id="navbar-search-input" name="q" placeholder="{{ trans('skinlib.general.search-textures') }}" value="{{ $q or '' }}" />
+                                <input type="text" class="form-control" id="navbar-search-input" name="q" placeholder="@lang('skinlib.general.search-textures')" value="{{ $q or '' }}" />
                             </div>
                         </form>
                         @endunless
@@ -90,7 +90,7 @@
                     <!-- Navbar Right Menu -->
                     <div class="navbar-custom-menu">
                         <ul class="nav navbar-nav">
-                            <li><a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> <span class="description-text">{{ trans('skinlib.general.upload-new-skin') }}</span></a></li>
+                            <li><a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> <span class="description-text">@lang('skinlib.general.upload-new-skin')</span></a></li>
 
                             @include('common.language')
 
@@ -103,7 +103,7 @@
                                 <a href="{{ url('auth/login') }}">
                                     <i class="fa fa-user"></i>
                                     <!-- hidden-xs hides the username on small devices so only the image appears. -->
-                                    <span class="hidden-xs nickname">{{ trans('general.anonymous') }}</span>
+                                    <span class="hidden-xs nickname">@lang('general.anonymous')</span>
                                 </a>
                             </li>
                             @endif
diff --git a/resources/views/skinlib/show.tpl b/resources/views/skinlib/show.tpl
index 70503c2a..238f1398 100644
--- a/resources/views/skinlib/show.tpl
+++ b/resources/views/skinlib/show.tpl
@@ -9,7 +9,7 @@
         <!-- Content Header (Page header) -->
         <section class="content-header">
             <h1>
-                {{ trans('skinlib.show.title') }}
+                @lang('skinlib.show.title')
             </h1>
         </section>
 
@@ -22,17 +22,17 @@
 
                         <div class="box-footer">
                             @if (is_null($user)) {{-- Not logged in --}}
-                            <button disabled="disabled" title="{{ trans('skinlib.show.anonymous') }}" class="btn btn-primary pull-right">{{ trans('skinlib.item.add-to-closet') }}</button>
+                            <button disabled="disabled" title="@lang('skinlib.show.anonymous')" class="btn btn-primary pull-right">@lang('skinlib.item.add-to-closet')</button>
                             @else
 
                                 @if ($user->getCloset()->has($texture->tid))
-                                <a onclick="removeFromCloset({{ $texture->tid }});" id="{{ $texture->tid }}" class="btn btn-primary pull-right">{{ trans('skinlib.item.remove-from-closet') }}</a>
+                                <a onclick="removeFromCloset({{ $texture->tid }});" id="{{ $texture->tid }}" class="btn btn-primary pull-right">@lang('skinlib.item.remove-from-closet')</a>
                                 @else
-                                <a onclick="addToCloset({{ $texture->tid }});" id="{{ $texture->tid }}" class="btn btn-primary pull-right">{{ trans('skinlib.item.add-to-closet') }}</a>
+                                <a onclick="addToCloset({{ $texture->tid }});" id="{{ $texture->tid }}" class="btn btn-primary pull-right">@lang('skinlib.item.add-to-closet')</a>
                                 @endif
 
                             @endif
-                            <div class="btn likes" title="{{ trans('skinlib.show.likes') }}" data-toggle="tooltip" data-placement="top"><i class="fa fa-heart"></i>
+                            <div class="btn likes" title="@lang('skinlib.show.likes')" data-toggle="tooltip" data-placement="top"><i class="fa fa-heart"></i>
                                 <span id="likes">{{ $texture->likes }}</span>
                             </div>
                         </div><!-- /.box-footer -->
@@ -41,26 +41,26 @@
                 <div class="col-md-4">
                     <div class="box box-primary">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ trans('skinlib.show.detail') }}</h3>
+                            <h3 class="box-title">@lang('skinlib.show.detail')</h3>
                         </div><!-- /.box-header -->
                         <div class="box-body">
                             <table class="table">
                                 <tbody>
                                     <tr>
-                                        <td>{{ trans('skinlib.show.name') }}</td>
+                                        <td>@lang('skinlib.show.name')</td>
                                         <td id="name">{{ $texture->name }}
                                             @if (!is_null($user) && ($texture->uploader == $user->uid || $user->isAdmin()))
                                             <small>
-                                                <a style="cursor: pointer" onclick="changeTextureName({{ $texture->tid }}, '{{ $texture->name }}');">{{ trans('skinlib.show.edit-name') }}</a>
+                                                <a style="cursor: pointer" onclick="changeTextureName({{ $texture->tid }}, '{{ $texture->name }}');">@lang('skinlib.show.edit-name')</a>
                                             </small>
                                             @endif
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>{{ trans('skinlib.show.model') }}</td>
+                                        <td>@lang('skinlib.show.model')</td>
                                         <td>
                                             @if ($texture->type == 'cape')
-                                                {{ trans('general.cape') }}
+                                                @lang('general.cape')
                                             @else
                                                 {{ $texture->type }}
                                             @endif
@@ -68,26 +68,26 @@
                                     </tr>
                                     <tr>
                                         <td>Hash
-                                            <i class="fa fa-question-circle" title="{{ trans('skinlib.show.download-raw') }}" data-toggle="tooltip" data-placement="top"></i>
+                                            <i class="fa fa-question-circle" title="@lang('skinlib.show.download-raw')" data-toggle="tooltip" data-placement="top"></i>
                                         </td>
                                         <td>
                                             <a href="{{ url('raw/'.$texture->tid) }}.png" title="{{ $texture->hash }}">{{ substr($texture->hash, 0, 15) }}...</a>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <td>{{ trans('skinlib.show.size') }}</td>
+                                        <td>@lang('skinlib.show.size')</td>
                                         <td>{{ $texture->size }} KB</td>
                                     </tr>
                                     <tr>
-                                        <td>{{ trans('skinlib.show.uploader') }}</td>
+                                        <td>@lang('skinlib.show.uploader')</td>
                                         @if ($uploader = app('users')->get($texture->uploader))
                                         <td><a href="{{ url('skinlib?filter='.($texture->type == 'cape' ? 'cape' : 'skin').'&uploader='.$uploader->uid) }}&sort=time">{{ $uploader->getNickName() }}</a></td>
                                         @else
-                                        <td><a href="#">{{ trans('general.unexistent-user') }}</a></td>
+                                        <td><a href="#">@lang('general.unexistent-user')</a></td>
                                         @endif
                                     </tr>
                                     <tr>
-                                        <td>{{ trans('skinlib.show.upload-at') }}</td>
+                                        <td>@lang('skinlib.show.upload-at')</td>
                                         <td>{{ $texture->upload_at }}</td>
                                     </tr>
                                 </tbody>
@@ -116,7 +116,7 @@
                 <div class="col-md-12">
                     <div class="box box-default">
                         <div class="box-header with-border">
-                            <h3 class="box-title">{{ trans('skinlib.show.comment') }}</h3>
+                            <h3 class="box-title">@lang('skinlib.show.comment')</h3>
                         </div><!-- /.box-header -->
                         <div class="box-body">
                             @if (option('comment_script') != "")
@@ -124,7 +124,7 @@
                             {!! Utils::getStringReplaced(option('comment_script'), ['{tid}' => $texture->tid, '{name}' => $texture->name, '{url}' => get_current_url()]) !!}
                             <!-- Comment End -->
                             @else
-                            <p style="text-align: center; margin: 30px 0;">{{ trans('skinlib.show.comment-not-available') }}</p>
+                            <p style="text-align: center; margin: 30px 0;">@lang('skinlib.show.comment-not-available')</p>
                             @endif
                         </div><!-- /.box-body -->
                     </div><!-- /.box -->
diff --git a/resources/views/skinlib/upload.tpl b/resources/views/skinlib/upload.tpl
index f9fe110c..5adfe668 100644
--- a/resources/views/skinlib/upload.tpl
+++ b/resources/views/skinlib/upload.tpl
@@ -18,7 +18,7 @@
         <!-- Content Header (Page header) -->
         <section class="content-header">
             <h1>
-                {{ trans('skinlib.upload.title') }}
+                @lang('skinlib.upload.title')
             </h1>
         </section>
 
@@ -29,24 +29,24 @@
                     <div class="box box-primary">
                         <div class="box-body">
                             <div class="form-group">
-                                <label for="name">{{ trans('skinlib.upload.texture-name') }}</label>
-                                <input id="name" class="form-control" type="text" placeholder="{{ trans('skinlib.upload.name-rule') }}" />
+                                <label for="name">@lang('skinlib.upload.texture-name')</label>
+                                <input id="name" class="form-control" type="text" placeholder="@lang('skinlib.upload.name-rule')" />
                             </div>
 
                             <div class="form-group">
-                                <label>{{ trans('skinlib.upload.texture-type') }}</label>
+                                <label>@lang('skinlib.upload.texture-type')</label>
                                 <div class="row">
                                     <div class="col-md-6">
                                         <div class="row">
                                             <div class="col-xs-4">
                                                 <label for="type-skin">
-                                                    <input type="radio" name="type" id="type-skin" checked> {{ trans('general.skin') }}
+                                                    <input type="radio" name="type" id="type-skin" checked> @lang('general.skin')
                                                 </label>
                                             </div>
                                             <div class="col-xs-8">
                                                 <select class="form-control" id="skin-type">
-                                                    <option value="steve">{{ trans('skinlib.filter.steve-model') }}</option>
-                                                    <option value="alex">{{ trans('skinlib.filter.alex-model') }}</option>
+                                                    <option value="steve">@lang('skinlib.filter.steve-model')</option>
+                                                    <option value="alex">@lang('skinlib.filter.alex-model')</option>
                                                 </select>
                                             </div>
                                         </div>
@@ -54,7 +54,7 @@
 
                                     <div class="col-md-6">
                                         <label for="type-cape">
-                                            <input type="radio" name="type" id="type-cape"> {{ trans('general.cape') }}
+                                            <input type="radio" name="type" id="type-cape"> @lang('general.cape')
                                         </label>
                                     </div>
                                 </div>
@@ -62,20 +62,20 @@
                             </div>
 
                             <div class="form-group">
-                                <label for="file">{{ trans('skinlib.upload.select-file') }}</label>
+                                <label for="file">@lang('skinlib.upload.select-file')</label>
                                 <input id="file" type="file" data-show-upload="false" data-language="{{ config('app.locale') }}" class="file" accept="image/png" />
                             </div>
 
                             <div class="callout callout-info" id="msg" style="display: none;">
-                                <p>{{ trans('skinlib.upload.private-score-notice', ['score' => option('private_score_per_storage')]) }}</p>
+                                <p>@lang('skinlib.upload.private-score-notice', ['score' => option('private_score_per_storage')])</p>
                             </div>
                         </div><!-- /.box-body -->
 
                         <div class="box-footer">
-                            <label for="private" class="pull-right" title="{{ trans('skinlib.upload.privacy-notice') }}" data-placement="top" data-toggle="tooltip">
-                                <input id="private" type="checkbox"> {{ trans('skinlib.upload.set-as-private') }}
+                            <label for="private" class="pull-right" title="@lang('skinlib.upload.privacy-notice')" data-placement="top" data-toggle="tooltip">
+                                <input id="private" type="checkbox"> @lang('skinlib.upload.set-as-private')
                             </label>
-                            <button id="upload-button" onclick="upload()" class="btn btn-primary">{{ trans('skinlib.upload.button') }}</button>
+                            <button id="upload-button" onclick="upload()" class="btn btn-primary">@lang('skinlib.upload.button')</button>
                         </div>
                     </div><!-- /.box -->
                 </div>
diff --git a/resources/views/user/closet.tpl b/resources/views/user/closet.tpl
index a45b6630..145ac6c5 100644
--- a/resources/views/user/closet.tpl
+++ b/resources/views/user/closet.tpl
@@ -9,11 +9,11 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.my-closet') }}
+            @lang('general.my-closet')
         </h1>
         <div class="breadcrumb">
-            <a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload"></i> {{ trans('user.closet.upload') }}</a>
-            <a href="{{ url('skinlib') }}"><i class="fa fa-search"></i> {{ trans('user.closet.search') }}</a>
+            <a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload"></i> @lang('user.closet.upload')</a>
+            <a href="{{ url('skinlib') }}"><i class="fa fa-search"></i> @lang('user.closet.search')</a>
         </div>
     </section>
 
@@ -26,13 +26,13 @@
                 <div class="nav-tabs-custom" id="closet-container">
                     <!-- Tabs within a box -->
                     <ul class="nav nav-tabs">
-                        <li class="active"><a href="#skin-category" class="category-switch" data-toggle="tab">{{ trans('general.skin') }}</a></li>
-                        <li><a href="#cape-category" class="category-switch" data-toggle="tab">{{ trans('general.cape') }}</a></li>
+                        <li class="active"><a href="#skin-category" class="category-switch" data-toggle="tab">@lang('general.skin')</a></li>
+                        <li><a href="#cape-category" class="category-switch" data-toggle="tab">@lang('general.cape')</a></li>
 
                         <li class="pull-right" style="padding: 7px;">
                             <div class="has-feedback pull-right">
                                 <div class="user-search-form">
-                                    <input type="text" name="q" class="form-control input-sm" placeholder="{{ trans('user.closet.type-to-search') }}">
+                                    <input type="text" name="q" class="form-control input-sm" placeholder="@lang('user.closet.type-to-search')">
                                     <span class="glyphicon glyphicon-search form-control-feedback"></span>
                                 </div>
                             </div>
@@ -56,8 +56,8 @@
                     @include('common.texture-preview')
 
                     <div class="box-footer">
-                        <button class="btn btn-primary" data-toggle="modal" data-target="#modal-use-as">{{ trans('user.closet.use-as.button') }}</button>
-                        <button class="btn btn-default pull-right" id="closet-reset">{{ trans('user.closet.use-as.reset') }}</button>
+                        <button class="btn btn-primary" data-toggle="modal" data-target="#modal-use-as">@lang('user.closet.use-as.button')</button>
+                        <button class="btn btn-default pull-right" id="closet-reset">@lang('user.closet.use-as.reset')</button>
                     </div><!-- /.box-footer -->
                 </div>
             </div>
@@ -71,7 +71,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ trans('user.closet.use-as.title') }}</h4>
+                <h4 class="modal-title">@lang('user.closet.use-as.title')</h4>
             </div>
             <div class="modal-body">
                 @forelse($user->players as $player)
@@ -79,12 +79,12 @@
                     <input type="radio" id="{{ $player->pid }}" name="player" /> {{ $player->player_name }}
                 </label><br />
                 @empty
-                <p>{{ trans('user.closet.use-as.empty') }}</p>
+                <p>@lang('user.closet.use-as.empty')</p>
                 @endforelse
             </div>
             <div class="modal-footer">
-                <a href="./player" class="btn btn-default pull-left">{{ trans('user.closet.use-as.add') }}</a>
-                <a onclick="setTexture();" class="btn btn-primary">{{ trans('general.submit') }}</a>
+                <a href="./player" class="btn btn-default pull-left">@lang('user.closet.use-as.add')</a>
+                <a onclick="setTexture();" class="btn btn-primary">@lang('general.submit')</a>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
diff --git a/resources/views/user/index.tpl b/resources/views/user/index.tpl
index 260e1398..63be1f7c 100644
--- a/resources/views/user/index.tpl
+++ b/resources/views/user/index.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.dashboard') }}
+            @lang('general.dashboard')
         </h1>
     </section>
 
@@ -24,20 +24,20 @@
             <div class="col-md-8">
                 <div class="box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.used.title') }}</h3>
+                        <h3 class="box-title">@lang('user.used.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         <div class="row">
                             <div class="col-md-8">
                                 <div class="progress-group">
-                                    <span class="progress-text">{{ trans('user.used.players') }}</span>
+                                    <span class="progress-text">@lang('user.used.players')</span>
                                     <span class="progress-number"><b>{{ $statistics['players']['used'] }}</b>/ {{ $statistics['players']['total'] }}</span>
                                     <div class="progress sm">
                                         <div class="progress-bar progress-bar-aqua" style="width: {{ $statistics['players']['percentage'] }}%"></div>
                                     </div>
                                 </div><!-- /.progress-group -->
                                 <div class="progress-group">
-                                    <span class="progress-text">{{ trans('user.used.storage') }}</span>
+                                    <span class="progress-text">@lang('user.used.storage')</span>
 
                                     <?php
                                         $used  = $statistics['storage']['used'];
@@ -59,28 +59,28 @@
                             </div><!-- /.col -->
                             <div class="col-md-4">
                                 <p class="text-center">
-                                    <strong>{{ trans('user.cur-score') }}</strong>
+                                    <strong>@lang('user.cur-score')</strong>
                                 </p>
                                 <p id="score" data-toggle="modal" data-target="#modal-score-instruction">
                                     {{ $user->getScore() }}
                                 </p>
-                                <p class="text-center" style="font-size: smaller; margin-top: 20px;">{{ trans('user.score-notice') }}</p>
+                                <p class="text-center" style="font-size: smaller; margin-top: 20px;">@lang('user.score-notice')</p>
                             </div><!-- /.col -->
                         </div><!-- /.row -->
                     </div><!-- ./box-body -->
                     <div class="box-footer">
                         @if ($user->canSign())
                         <button id="sign-button" class="btn btn-primary pull-left" onclick="sign()">
-                            <i class="fa fa-calendar-check-o" aria-hidden="true"></i> &nbsp;{{ trans('user.sign') }}
+                            <i class="fa fa-calendar-check-o" aria-hidden="true"></i> &nbsp;@lang('user.sign')
                         </button>
                         @else
-                        <button class="btn btn-primary pull-left" title="{{ trans('user.last-sign', ['time' => $user->getLastSignTime()]) }}" disabled="disabled">
+                        <button class="btn btn-primary pull-left" title="@lang('user.last-sign', ['time' => $user->getLastSignTime()])" disabled="disabled">
                             <i class="fa fa-calendar-check-o" aria-hidden="true"></i> &nbsp;
                             <?php $hours = $user->getSignRemainingTime() / 3600; ?>
                             @if ($hours >= 1)
-                                {{ trans('user.sign-remain-time', ['time' => round($hours), 'unit' => trans('user.time-unit-hour')]) }}
+                                @lang('user.sign-remain-time', ['time' => round($hours), 'unit' => trans('user.time-unit-hour')])
                             @else
-                                {{ trans('user.sign-remain-time', ['time' => round($hours * 60), 'unit' => trans('user.time-unit-min')]) }}
+                                @lang('user.sign-remain-time', ['time' => round($hours * 60), 'unit' => trans('user.time-unit-min')])
                             @endif
                         </button>
                         @endif
@@ -91,7 +91,7 @@
             <div class="col-md-4">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.announcement') }}</h3>
+                        <h3 class="box-title">@lang('user.announcement')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         {!! bs_announcement() !!}
@@ -109,7 +109,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ trans('user.score-intro.title') }}</h4>
+                <h4 class="modal-title">@lang('user.score-intro.title')</h4>
             </div>
             <div class="modal-body">
                 <?php list($from, $to) = explode(',', Option::get('sign_score')); ?>
@@ -124,18 +124,18 @@
 
                 <div class="row">
                     <div class="col-md-4">
-                        <p class="text-center">{{ trans('user.score-intro.rates.storage', ['score' => option('score_per_storage')]) }}</p>
+                        <p class="text-center">@lang('user.score-intro.rates.storage', ['score' => option('score_per_storage')])</p>
                     </div>
                     <div class="col-md-4">
-                        <p class="text-center">{{ trans('user.score-intro.rates.player', ['score' => option('score_per_player')]) }}</p>
+                        <p class="text-center">@lang('user.score-intro.rates.player', ['score' => option('score_per_player')])</p>
                     </div>
                     <div class="col-md-4">
-                        <p class="text-center">{{ trans('user.score-intro.rates.closet', ['score' => option('score_per_closet_item')]) }}</p>
+                        <p class="text-center">@lang('user.score-intro.rates.closet', ['score' => option('score_per_closet_item')])</p>
                     </div>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.close') }}</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">@lang('general.close')</button>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
diff --git a/resources/views/user/master.tpl b/resources/views/user/master.tpl
index 3b6b36cf..52c58d12 100644
--- a/resources/views/user/master.tpl
+++ b/resources/views/user/master.tpl
@@ -62,15 +62,15 @@
 
                 <!-- Sidebar Menu -->
                 <ul class="sidebar-menu tree" data-widget="tree">
-                    <li class="header">{{ trans('general.user-center') }}</li>
+                    <li class="header">@lang('general.user-center')</li>
                     {!! bs_menu('user') !!}
 
-                    <li class="header">{{ trans('general.explore') }}</li>
-                    <li><a href="{{ url('skinlib') }}"><i class="fa fa-archive"></i> <span>{{ trans('general.skinlib') }}</span></a></li>
+                    <li class="header">@lang('general.explore')</li>
+                    <li><a href="{{ url('skinlib') }}"><i class="fa fa-archive"></i> <span>@lang('general.skinlib')</span></a></li>
 
                     @admin($user)
-                    <li class="header">{{ trans('general.manage') }}</li>
-                    <li><a href="{{ url('admin') }}"><i class="fa fa-cog"></i> <span>{{ trans('general.admin-panel') }}</span></a></li>
+                    <li class="header">@lang('general.manage')</li>
+                    <li><a href="{{ url('admin') }}"><i class="fa fa-cog"></i> <span>@lang('general.admin-panel')</span></a></li>
                     @endadmin
                 </ul><!-- /.sidebar-menu -->
             </section>
diff --git a/resources/views/user/player.tpl b/resources/views/user/player.tpl
index 54830124..92e1b927 100644
--- a/resources/views/user/player.tpl
+++ b/resources/views/user/player.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.player-manage') }}
+            @lang('general.player-manage')
         </h1>
     </section>
 
@@ -23,13 +23,13 @@
                             <thead>
                                 <tr>
                                     <th>PID</th>
-                                    <th>{{ trans('user.player.player-name') }}</th>
+                                    <th>@lang('user.player.player-name')</th>
                                     <th>
-                                      {{ trans('user.player.preference.title') }}
-                                      <i class="fa fa-question-circle" title="{{ trans('user.player.preference.description') }}" data-toggle="tooltip" data-placement="right"></i>
+                                      @lang('user.player.preference.title')
+                                      <i class="fa fa-question-circle" title="@lang('user.player.preference.description')" data-toggle="tooltip" data-placement="right"></i>
                                     </th>
-                                    <th>{{ trans('user.player.edit') }}</th>
-                                    <th>{{ trans('user.player.operation') }}</th>
+                                    <th>@lang('user.player.edit')</th>
+                                    <th>@lang('user.player.operation')</th>
                                 </tr>
                             </thead>
 
@@ -45,11 +45,11 @@
                                        </select>
                                     </td>
                                     <td>
-                                        <a class="btn btn-default btn-sm" onclick="changePlayerName('{{ $player['pid'] }}', '{{ $player['player_name'] }}')">{{ trans('user.player.edit-pname') }}</a>
+                                        <a class="btn btn-default btn-sm" onclick="changePlayerName('{{ $player['pid'] }}', '{{ $player['player_name'] }}')">@lang('user.player.edit-pname')</a>
                                     </td>
                                     <td>
-                                        <a class="btn btn-warning btn-sm" onclick="clearTexture('{{ $player['pid'] }}');">{{ trans('user.player.delete-texture') }}</a>
-                                        <a class="btn btn-danger btn-sm" onclick="deletePlayer('{{ $player['pid'] }}');">{{ trans('user.player.delete-player') }}</a>
+                                        <a class="btn btn-warning btn-sm" onclick="clearTexture('{{ $player['pid'] }}');">@lang('user.player.delete-texture')</a>
+                                        <a class="btn btn-danger btn-sm" onclick="deletePlayer('{{ $player['pid'] }}');">@lang('user.player.delete-player')</a>
                                     </td>
                                 </tr>
                                 @endforeach
@@ -58,20 +58,20 @@
                     </div>
                     <div class="box-footer clearfix">
                         <button class="btn btn-primary pull-left" data-toggle="modal" data-target="#modal-add-player">
-                            <i class="fa fa-plus" aria-hidden="true"></i> &nbsp;{{ trans('user.player.add-player') }}
+                            <i class="fa fa-plus" aria-hidden="true"></i> &nbsp;@lang('user.player.add-player')
                         </button>
                     </div>
                 </div>
 
                 <div class="box box-default collapsed-box">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('general.notice') }}</h3>
+                        <h3 class="box-title">@lang('general.notice')</h3>
                         <div class="box-tools pull-right">
                             <button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button>
                         </div><!-- /.box-tools -->
                     </div><!-- /.box-header -->
                     <div class="box-body">
-                        <p>{{ trans('user.player.login-notice') }}</p>
+                        <p>@lang('user.player.login-notice')</p>
                     </div><!-- /.box-body -->
                 </div><!-- /.box -->
             </div>
@@ -82,21 +82,21 @@
                     <!-- 2D skin preview -->
                     <div class="box-body">
                         <div id="preview-2d-container" style="display: none;">
-                            <p>{{ trans('user.player.textures.steve') }}<a href=""><img id="steve" class="skin2d" /></a>
-                                <span class="skin2d">{{ trans('user.player.textures.empty') }}</span>
+                            <p>@lang('user.player.textures.steve')<a href=""><img id="steve" class="skin2d" /></a>
+                                <span class="skin2d">@lang('user.player.textures.empty')</span>
                             </p>
 
-                            <p>{{ trans('user.player.textures.alex') }}<a href=""><img id="alex" class="skin2d" /></a>
-                                <span class="skin2d">{{ trans('user.player.textures.empty') }}</span>
+                            <p>@lang('user.player.textures.alex')<a href=""><img id="alex" class="skin2d" /></a>
+                                <span class="skin2d">@lang('user.player.textures.empty')</span>
                             </p>
 
-                            <p>{{ trans('user.player.textures.cape') }}<a href=""><img id="cape" class="skin2d" /></a>
-                                <span class="skin2d">{{ trans('user.player.textures.empty') }}</span>
+                            <p>@lang('user.player.textures.cape')<a href=""><img id="cape" class="skin2d" /></a>
+                                <span class="skin2d">@lang('user.player.textures.empty')</span>
                             </p>
                         </div>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button id="preview-switch" class="btn btn-default">{{ trans('general.switch-2d-preview') }}</button>
+                        <button id="preview-switch" class="btn btn-default">@lang('general.switch-2d-preview')</button>
                     </div>
                 </div><!-- /.box -->
             </div>
@@ -110,13 +110,13 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ trans('user.player.add-player') }}</h4>
+                <h4 class="modal-title">@lang('user.player.add-player')</h4>
             </div>
             <div class="modal-body">
                 <table class="table">
                     <tbody>
                         <tr>
-                            <td class="key">{{ trans('user.player.player-name') }}</td>
+                            <td class="key">@lang('user.player.player-name')</td>
                             <td class="value">
                                <input type="text" class="form-control" id="player_name" value="">
                             </td>
@@ -126,14 +126,14 @@
 
                 <div class="callout callout-info">
                     <ul style="padding: 0 0 0 20px; margin: 0;">
-                        <li>{{ trans('user.player.player-name-rule.'.option('player_name_rule')) }}</li>
-                        <li>{{ trans('user.player.player-name-length', ['min' => option('player_name_length_min'), 'max' => option('player_name_length_max')]) }}</li>
+                        <li>@lang('user.player.player-name-rule.'.option('player_name_rule'))</li>
+                        <li>@lang('user.player.player-name-length', ['min' => option('player_name_length_min'), 'max' => option('player_name_length_max')])</li>
                     </ul>
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.close') }}</button>
-                <a onclick="addNewPlayer();" class="btn btn-primary">{{ trans('general.submit') }}</a>
+                <button type="button" class="btn btn-default" data-dismiss="modal">@lang('general.close')</button>
+                <a onclick="addNewPlayer();" class="btn btn-primary">@lang('general.submit')</a>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
diff --git a/resources/views/user/profile.tpl b/resources/views/user/profile.tpl
index 94690611..6fe2aef9 100644
--- a/resources/views/user/profile.tpl
+++ b/resources/views/user/profile.tpl
@@ -9,7 +9,7 @@
     <!-- Content Header (Page header) -->
     <section class="content-header">
         <h1>
-            {{ trans('general.profile') }}
+            @lang('general.profile')
         </h1>
     </section>
 
@@ -19,7 +19,7 @@
             <div class="col-md-6">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.profile.avatar.title') }}</h3>
+                        <h3 class="box-title">@lang('user.profile.avatar.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         {!! trans('user.profile.avatar.notice') !!}
@@ -28,33 +28,33 @@
 
                 <div class="box box-warning">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.profile.password.title') }}</h3>
+                        <h3 class="box-title">@lang('user.profile.password.title')</h3>
                     </div><!-- /.box-header -->
                     <div class="box-body">
                         <div class="form-group">
-                            <label for="password">{{ trans('user.profile.password.old') }}</label>
+                            <label for="password">@lang('user.profile.password.old')</label>
                             <input type="password" class="form-control" id="password" value="">
                         </div>
 
                         <div class="form-group">
-                            <label for="new-passwd">{{ trans('user.profile.password.new') }}</label>
+                            <label for="new-passwd">@lang('user.profile.password.new')</label>
                             <input type="password" class="form-control" id="new-passwd" value="">
                         </div>
 
                         <div class="form-group">
-                            <label for="confirm-pwd">{{ trans('user.profile.password.confirm') }}</label>
+                            <label for="confirm-pwd">@lang('user.profile.password.confirm')</label>
                             <input type="password" class="form-control" id="confirm-pwd" value="">
                         </div>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button onclick="changePassword()" class="btn btn-primary">{{ trans('user.profile.password.button') }}</button>
+                        <button onclick="changePassword()" class="btn btn-primary">@lang('user.profile.password.button')</button>
                     </div>
                 </div><!-- /.box -->
             </div>
             <div class="col-md-6">
                 <div class="box box-primary">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.profile.nickname.title') }}</h3>
+                        <h3 class="box-title">@lang('user.profile.nickname.title')</h3>
                         </div><!-- /.box-header -->
                         <div class="box-body">
                         <div class="form-group has-feedback">
@@ -63,40 +63,40 @@
                         </div>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button onclick="changeNickName()" class="btn btn-primary">{{ trans('general.submit') }}</button>
+                        <button onclick="changeNickName()" class="btn btn-primary">@lang('general.submit')</button>
                     </div>
                 </div>
 
                 <div class="box box-warning">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.profile.email.title') }}</h3>
+                        <h3 class="box-title">@lang('user.profile.email.title')</h3>
                         </div><!-- /.box-header -->
                         <div class="box-body">
                         <div class="form-group has-feedback">
-                            <input id="new-email" type="email" class="form-control" placeholder="{{ trans('user.profile.email.new') }}">
+                            <input id="new-email" type="email" class="form-control" placeholder="@lang('user.profile.email.new')">
                             <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
                         </div>
                         <div class="form-group has-feedback" style="display: none;">
-                            <input id="current-password" type="password" class="form-control" placeholder="{{ trans('user.profile.email.password') }}">
+                            <input id="current-password" type="password" class="form-control" placeholder="@lang('user.profile.email.password')">
                             <span class="glyphicon glyphicon-lock form-control-feedback"></span>
                         </div>
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button onclick="changeEmail()" class="btn btn-warning">{{ trans('user.profile.email.button') }}</button>
+                        <button onclick="changeEmail()" class="btn btn-warning">@lang('user.profile.email.button')</button>
                     </div>
                 </div>
 
                 <div class="box box-danger">
                     <div class="box-header with-border">
-                        <h3 class="box-title">{{ trans('user.profile.delete.title') }}</h3>
+                        <h3 class="box-title">@lang('user.profile.delete.title')</h3>
                         </div><!-- /.box-header -->
                         <div class="box-body">
                         @if (!$user->isAdmin())
-                        <p>{{ trans('user.profile.delete.notice', ['site' => option_localized('site_name')]) }}</p>
-                        <button id="delete" class="btn btn-danger" data-toggle="modal" data-target="#modal-delete-account">{{ trans('user.profile.delete.button') }}</button>
+                        <p>@lang('user.profile.delete.notice', ['site' => option_localized('site_name')])</p>
+                        <button id="delete" class="btn btn-danger" data-toggle="modal" data-target="#modal-delete-account">@lang('user.profile.delete.button')</button>
                         @else
-                        <p>{{ trans('user.profile.delete.admin') }}</p>
-                        <button class="btn btn-danger" disabled="disabled">{{ trans('user.profile.delete.button') }}</button>
+                        <p>@lang('user.profile.delete.admin')</p>
+                        <button class="btn btn-danger" disabled="disabled">@lang('user.profile.delete.button')</button>
                         @endif
                     </div><!-- /.box-body -->
                 </div>
@@ -111,17 +111,17 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title">{{ trans('user.profile.delete.modal-title') }}</h4>
+                <h4 class="modal-title">@lang('user.profile.delete.modal-title')</h4>
             </div>
             <div class="modal-body">
                 {!! nl2br(trans('user.profile.delete.modal-notice')) !!}
                 <br />
-                <input type="password" class="form-control" id="password" placeholder="{{ trans('user.profile.delete.password') }}">
+                <input type="password" class="form-control" id="password" placeholder="@lang('user.profile.delete.password')">
                 <br />
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-outline" data-dismiss="modal">{{ trans('general.close') }}</button>
-                <a onclick="deleteAccount();" class="btn btn-outline">{{ trans('general.submit') }}</a>
+                <button type="button" class="btn btn-outline" data-dismiss="modal">@lang('general.close')</button>
+                <a onclick="deleteAccount();" class="btn btn-outline">@lang('general.submit')</a>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->