diff --git a/animations/cascaded-animation.js b/animations/cascaded-animation.js
index 09cffaa..bcc41d0 100644
--- a/animations/cascaded-animation.js
+++ b/animations/cascaded-animation.js
@@ -29,6 +29,7 @@ Configuration:
 */
 Polymer({
   is: 'cascaded-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/fade-in-animation.js b/animations/fade-in-animation.js
index d50f350..561d26e 100644
--- a/animations/fade-in-animation.js
+++ b/animations/fade-in-animation.js
@@ -27,6 +27,7 @@ Configuration:
 Polymer({
 
   is: 'fade-in-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/fade-out-animation.js b/animations/fade-out-animation.js
index d72a3d7..b846564 100644
--- a/animations/fade-out-animation.js
+++ b/animations/fade-out-animation.js
@@ -27,6 +27,7 @@ Configuration:
 Polymer({
 
   is: 'fade-out-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/hero-animation.js b/animations/hero-animation.js
index 717be31..8e7c955 100644
--- a/animations/hero-animation.js
+++ b/animations/hero-animation.js
@@ -36,6 +36,7 @@ Configuration:
 Polymer({
 
   is: 'hero-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonSharedElementAnimationBehavior],
diff --git a/animations/opaque-animation.js b/animations/opaque-animation.js
index e539097..a2723bc 100644
--- a/animations/opaque-animation.js
+++ b/animations/opaque-animation.js
@@ -20,6 +20,7 @@ animation for elements that animate from display:none.
 Polymer({
 
   is: 'opaque-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/reverse-ripple-animation.js b/animations/reverse-ripple-animation.js
index 74e7531..5f521f1 100644
--- a/animations/reverse-ripple-animation.js
+++ b/animations/reverse-ripple-animation.js
@@ -37,6 +37,7 @@ Configuration:
 */
 Polymer({
   is: 'reverse-ripple-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonSharedElementAnimationBehavior],
diff --git a/animations/ripple-animation.js b/animations/ripple-animation.js
index 7f7d4e6..f19f472 100644
--- a/animations/ripple-animation.js
+++ b/animations/ripple-animation.js
@@ -39,6 +39,7 @@ Configuration:
 Polymer({
 
   is: 'ripple-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonSharedElementAnimationBehavior],
diff --git a/animations/scale-down-animation.js b/animations/scale-down-animation.js
index 6c91908..a1cc991 100644
--- a/animations/scale-down-animation.js
+++ b/animations/scale-down-animation.js
@@ -30,6 +30,7 @@ Configuration:
 Polymer({
 
   is: 'scale-down-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/scale-up-animation.js b/animations/scale-up-animation.js
index cbbc912..27f72e9 100644
--- a/animations/scale-up-animation.js
+++ b/animations/scale-up-animation.js
@@ -30,6 +30,7 @@ Configuration:
 Polymer({
 
   is: 'scale-up-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-down-animation.js b/animations/slide-down-animation.js
index 79a1137..70f5499 100644
--- a/animations/slide-down-animation.js
+++ b/animations/slide-down-animation.js
@@ -29,6 +29,7 @@ Configuration:
 Polymer({
 
   is: 'slide-down-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-from-bottom-animation.js b/animations/slide-from-bottom-animation.js
index d49d6f5..bcb69fe 100644
--- a/animations/slide-from-bottom-animation.js
+++ b/animations/slide-from-bottom-animation.js
@@ -28,6 +28,7 @@ Configuration:
 */
 Polymer({
   is: 'slide-from-bottom-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-from-left-animation.js b/animations/slide-from-left-animation.js
index 40d8432..8acd5cc 100644
--- a/animations/slide-from-left-animation.js
+++ b/animations/slide-from-left-animation.js
@@ -30,6 +30,7 @@ Configuration:
 Polymer({
 
   is: 'slide-from-left-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-from-right-animation.js b/animations/slide-from-right-animation.js
index 1cd3cc6..7434b64 100644
--- a/animations/slide-from-right-animation.js
+++ b/animations/slide-from-right-animation.js
@@ -31,6 +31,7 @@ Configuration:
 Polymer({
 
   is: 'slide-from-right-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-from-top-animation.js b/animations/slide-from-top-animation.js
index 94c7f24..193949b 100644
--- a/animations/slide-from-top-animation.js
+++ b/animations/slide-from-top-animation.js
@@ -28,6 +28,7 @@ Configuration:
 */
 Polymer({
   is: 'slide-from-top-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-left-animation.js b/animations/slide-left-animation.js
index 53a77d3..5052bca 100644
--- a/animations/slide-left-animation.js
+++ b/animations/slide-left-animation.js
@@ -28,6 +28,7 @@ Configuration:
 */
 Polymer({
   is: 'slide-left-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-right-animation.js b/animations/slide-right-animation.js
index e69f71b..9042256 100644
--- a/animations/slide-right-animation.js
+++ b/animations/slide-right-animation.js
@@ -29,6 +29,7 @@ Configuration:
 Polymer({
 
   is: 'slide-right-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/slide-up-animation.js b/animations/slide-up-animation.js
index a8f2ff5..c290ebb 100644
--- a/animations/slide-up-animation.js
+++ b/animations/slide-up-animation.js
@@ -28,6 +28,7 @@ Configuration:
 */
 Polymer({
   is: 'slide-up-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/animations/transform-animation.js b/animations/transform-animation.js
index 5c89980..1b741d8 100644
--- a/animations/transform-animation.js
+++ b/animations/transform-animation.js
@@ -30,6 +30,7 @@ Configuration:
 */
 Polymer({
   is: 'transform-animation',
+  /** @override */
   _template: null,
 
   behaviors: [NeonAnimationBehavior],
diff --git a/neon-animatable.js b/neon-animatable.js
index 99e75a6..a298d2d 100644
--- a/neon-animatable.js
+++ b/neon-animatable.js
@@ -31,6 +31,7 @@ import {NeonAnimatableBehavior} from './neon-animatable-behavior.js';
 ```
 */
 Polymer({
+  /** @override */
   _template: html`
     <style>
       :host {
diff --git a/neon-animated-pages.js b/neon-animated-pages.js
index 175f036..8c47c40 100644
--- a/neon-animated-pages.js
+++ b/neon-animated-pages.js
@@ -27,10 +27,10 @@ switching between them. Its children pages should implement
 `NeonAnimatableBehavior` and define `entry` and `exit` animations to be
 run when switching to or switching out of the page.
 
-@group Neon Elements
 @element neon-animated-pages
 */
 Polymer({
+  /** @override */
   _template: html`
     <style>
       :host {
diff --git a/neon-animation-behavior.js b/neon-animation-behavior.js
index bb11bb5..2f0ff3c 100644
--- a/neon-animation-behavior.js
+++ b/neon-animation-behavior.js
@@ -43,6 +43,7 @@ export const NeonAnimationBehavior = {
   // configure: function(config) {
   // },
 
+  /** @override */
   created: function() {
     if (!document.body.animate) {
       console.warn(