diff --git a/templates/index.blade.php b/templates/index.blade.php
index 869ed6f..bb3ef90 100644
--- a/templates/index.blade.php
+++ b/templates/index.blade.php
@@ -10,7 +10,7 @@
     {!! get_search_form(false) !!}
   @endif
 
-  @while (have_posts()) @php the_post() @endphp
+  @while (have_posts()) @php(the_post())
     @include ('partials.content-'.(get_post_type() !== 'post' ? get_post_type() : get_post_format()))
   @endwhile
 
diff --git a/templates/layouts/base.blade.php b/templates/layouts/base.blade.php
index dbde60f..d4706fb 100644
--- a/templates/layouts/base.blade.php
+++ b/templates/layouts/base.blade.php
@@ -1,13 +1,13 @@
 <!doctype html>
-<html @php language_attributes() @endphp>
+<html @php(language_attributes())>
   @include('partials.head')
-  <body @php body_class() @endphp>
+  <body @php(body_class())>
     <!--[if IE]>
       <div class="alert alert-warning">
         {!! __('You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.', 'sage') !!}
       </div>
     <![endif]-->
-    @php do_action('get_header') @endphp
+    @php(do_action('get_header'))
     @include('partials.header')
     <div class="wrap container" role="document">
       <div class="content row">
@@ -21,8 +21,8 @@
         @endif
       </div>
     </div>
-    @php do_action('get_footer') @endphp
+    @php(do_action('get_footer'))
     @include('partials.footer')
-    @php wp_footer() @endphp
+    @php(wp_footer())
   </body>
 </html>
diff --git a/templates/page.blade.php b/templates/page.blade.php
index 8ab09bc..d18f59b 100644
--- a/templates/page.blade.php
+++ b/templates/page.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base')
 
 @section('content')
-  @while(have_posts()) @php the_post() @endphp
+  @while(have_posts()) @php(the_post())
     @include('partials.page-header')
     @include('partials.content-page')
   @endwhile
diff --git a/templates/partials/comments.blade.php b/templates/partials/comments.blade.php
index a8c4d2e..b4ad4b3 100644
--- a/templates/partials/comments.blade.php
+++ b/templates/partials/comments.blade.php
@@ -18,10 +18,10 @@ if (post_password_required()) {
       <nav>
         <ul class="pager">
           @if (get_previous_comments_link())
-            <li class="previous">{!! previous_comments_link(__('&larr; Older comments', 'sage')) !!}</li>
+            <li class="previous">@php(previous_comments_link(__('&larr; Older comments', 'sage')))</li>
           @endif
           @if (get_next_comments_link())
-            <li class="next">{!! next_comments_link(__('Newer comments &rarr;', 'sage')) !!}</li>
+            <li class="next">@php(next_comments_link(__('Newer comments &rarr;', 'sage')))</li>
           @endif
         </ul>
       </nav>
@@ -34,5 +34,5 @@ if (post_password_required()) {
     </div>
   @endif
 
-  @php comment_form() @endphp
+  @php(comment_form())
 </section>
diff --git a/templates/partials/content-page.blade.php b/templates/partials/content-page.blade.php
index 14fb20c..d360d17 100644
--- a/templates/partials/content-page.blade.php
+++ b/templates/partials/content-page.blade.php
@@ -1,2 +1,2 @@
-@php the_content() @endphp
+@php(the_content())
 {!! wp_link_pages(['before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}
diff --git a/templates/partials/content-search.blade.php b/templates/partials/content-search.blade.php
index d1a0dd3..c051058 100644
--- a/templates/partials/content-search.blade.php
+++ b/templates/partials/content-search.blade.php
@@ -1,4 +1,4 @@
-<article @php post_class() @endphp>
+<article @php(post_class())>
   <header>
     <h2 class="entry-title"><a href="{{ get_permalink() }}">{{ get_the_title() }}</a></h2>
     @if (get_post_type() === 'post')
@@ -6,6 +6,6 @@
     @endif
   </header>
   <div class="entry-summary">
-    @php the_excerpt() @endphp
+    @php(the_excerpt())
   </div>
 </article>
diff --git a/templates/partials/content-single.blade.php b/templates/partials/content-single.blade.php
index f251483..35bdda5 100644
--- a/templates/partials/content-single.blade.php
+++ b/templates/partials/content-single.blade.php
@@ -1,13 +1,13 @@
-<article @php post_class() @endphp>
+<article @php(post_class())>
   <header>
     <h1 class="entry-title">{{ get_the_title() }}</h1>
     @include('partials/entry-meta')
   </header>
   <div class="entry-content">
-    @php the_content() @endphp
+    @php(the_content())
   </div>
   <footer>
     {!! wp_link_pages(['before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}
   </footer>
-  @php comments_template('/templates/partials/comments.blade.php') @endphp
+  @php(comments_template('/templates/partials/comments.blade.php'))
 </article>
diff --git a/templates/partials/content.blade.php b/templates/partials/content.blade.php
index 5035e81..0afcffd 100644
--- a/templates/partials/content.blade.php
+++ b/templates/partials/content.blade.php
@@ -1,9 +1,9 @@
-<article @php post_class() @endphp>
+<article @php(post_class())>
   <header>
     <h2 class="entry-title"><a href="{{ get_permalink() }}">{{ get_the_title() }}</a></h2>
     @include('partials/entry-meta')
   </header>
   <div class="entry-summary">
-    @php the_excerpt() @endphp
+    @php(the_excerpt())
   </div>
 </article>
diff --git a/templates/partials/footer.blade.php b/templates/partials/footer.blade.php
index da9feba..3c1fac1 100644
--- a/templates/partials/footer.blade.php
+++ b/templates/partials/footer.blade.php
@@ -1,5 +1,5 @@
 <footer class="content-info">
   <div class="container">
-    @php dynamic_sidebar('sidebar-footer') @endphp
+    @php(dynamic_sidebar('sidebar-footer'))
   </div>
 </footer>
diff --git a/templates/partials/head.blade.php b/templates/partials/head.blade.php
index 4f0e833..b6adcc5 100644
--- a/templates/partials/head.blade.php
+++ b/templates/partials/head.blade.php
@@ -2,5 +2,5 @@
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  @php wp_head() @endphp
+  @php(wp_head())
 </head>
diff --git a/templates/partials/sidebar.blade.php b/templates/partials/sidebar.blade.php
index a740998..d20b456 100644
--- a/templates/partials/sidebar.blade.php
+++ b/templates/partials/sidebar.blade.php
@@ -1 +1 @@
-@php dynamic_sidebar('sidebar-primary') @endphp
+@php(dynamic_sidebar('sidebar-primary'))
diff --git a/templates/search.blade.php b/templates/search.blade.php
index bb311ed..e5897c5 100644
--- a/templates/search.blade.php
+++ b/templates/search.blade.php
@@ -10,7 +10,7 @@
     {!! get_search_form(false) !!}
   @endif
 
-  @while(have_posts()) @php the_post() @endphp
+  @while(have_posts()) @php(the_post())
     @include('partials.content-search')
   @endwhile
 
diff --git a/templates/single.blade.php b/templates/single.blade.php
index a383216..62e9c85 100644
--- a/templates/single.blade.php
+++ b/templates/single.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base')
 
 @section('content')
-  @while(have_posts()) @php the_post() @endphp
+  @while(have_posts()) @php(the_post())
     @include('partials/content-single-'.get_post_type())
   @endwhile
 @endsection
diff --git a/templates/template-custom.blade.php b/templates/template-custom.blade.php
index 228e2b7..460854d 100644
--- a/templates/template-custom.blade.php
+++ b/templates/template-custom.blade.php
@@ -1,13 +1,11 @@
-@php
-/**
- * Template Name: Custom Template
- */
-@endphp
+{{--
+  Template Name: Custom Template
+--}}
 
 @extends('layouts.base')
 
 @section('content')
-  @while(have_posts()) @php the_post() @endphp
+  @while(have_posts()) @php(the_post())
     @include('partials.page-header')
     @include('partials.content-page')
   @endwhile
