diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index f9a038ff..8a366f41 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -3541,7 +3541,7 @@ XPages:
   extensions:
   - .xsp
   - .xsp-config
-  - .xsp-metadata
+  - .xsp.metadata
   - .form
   - .view
   ace_mode: xml
diff --git a/samples/XPages/navbar.xsp b/samples/XPages/navbar.xsp
new file mode 100755
index 00000000..c7a5669e
--- /dev/null
+++ b/samples/XPages/navbar.xsp
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xp:view
+	xmlns:xp="http://www.ibm.com/xsp/core">
+	<div
+		class="navbar navbar-default navbar-fixed-top"
+		role="navigation">
+		<div
+			class="navbar-header">
+			<button
+				type="button"
+				class="navbar-toggle"
+				data-toggle="collapse"
+				data-target=".navbar-collapse">
+				<xp:text
+					styleClass="sr-only"
+					value="Toggle navigation" />
+				<xp:repeat
+					value="#{3}">
+					<span
+						class="icon-bar" />
+				</xp:repeat>
+			</button>
+			<xp:link
+				styleClass="navbar-brand"
+				value="/"
+				text="#{database.title}" />
+		</div>
+		<div
+			class="collapse navbar-collapse">
+			<ul
+				class="nav navbar-nav navbar-right">
+				<xp:panel
+					tagName="li">
+					<xp:this.styleClass><![CDATA[${javascript:return view.getPageName()=="/index.xsp"?"active":null;}]]></xp:this.styleClass>
+					<xp:link
+						text=" Houses"
+						value="/index.xsp">
+						<i
+							class="fa fa-list fa-lg" />
+					</xp:link>
+				</xp:panel>
+				<xp:panel tagName="li">
+					<xp:this.styleClass><![CDATA[${javascript:return view.getPageName()=="/house.xsp"?"active":null;}]]></xp:this.styleClass>
+					<xp:link
+						text=" New House"
+						value="/house.xsp">
+						<i class="fa fa-plus-square fa-lg" />
+					</xp:link>
+				</xp:panel>
+			</ul>
+		</div>
+	</div>
+</xp:view>
\ No newline at end of file
diff --git a/samples/XPages/navbar.xsp-config b/samples/XPages/navbar.xsp-config
new file mode 100755
index 00000000..d32555bb
--- /dev/null
+++ b/samples/XPages/navbar.xsp-config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config>
+  <faces-config-extension>
+    <namespace-uri>http://www.ibm.com/xsp/custom</namespace-uri>
+    <default-prefix>xc</default-prefix>
+  </faces-config-extension>
+  <composite-component>
+    <component-type>navbar</component-type>
+    <composite-name>navbar</composite-name>
+    <composite-file>/navbar.xsp</composite-file>
+    <composite-extension>
+      <designer-extension>
+        <in-palette>true</in-palette>
+      </designer-extension>
+    </composite-extension>
+  </composite-component>
+</faces-config>
diff --git a/samples/XPages/navbar.xsp.metadata b/samples/XPages/navbar.xsp.metadata
new file mode 100755
index 00000000..120b7002
--- /dev/null
+++ b/samples/XPages/navbar.xsp.metadata
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="1.0" replicaid="88257E000001FF59" version="9.0" xmlns="http://www.lotus.com/dxl">
+<noteinfo noteid="1aa" sequence="14" unid="47D707801D48026E85257C48007E06C7">
+<created><datetime>20131221T175632,71-05</datetime></created>
+<modified><datetime>20150305T194407,22-08</datetime></modified>
+<revised><datetime>20150305T194407,21-08</datetime></revised>
+<lastaccessed><datetime>20150305T194407,22-08</datetime></lastaccessed>
+<addedtofile><datetime>20150305T162153,30-08</datetime></addedtofile></noteinfo>
+<updatedby><name>CN=Eric McCormick/O=Eric McCormick</name></updatedby>
+<wassignedby><name>CN=Eric McCormick/O=Eric McCormick</name></wassignedby>
+<item name="$Flags"><text>gC~4;</text></item>
+<item name="$TITLE"><text>navbar.xsp</text></item>
+
+
+
+
+
+<item name="$FileNames" sign="true"><text>navbar.xsp</text></item>
+<item name="$DesignerVersion"><text>8.5.3</text></item>
+
+
+
+</note>
\ No newline at end of file