diff --git a/package.json b/package.json
index 29e39e4..d583006 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@angular/platform-browser-dynamic": "^8.0.0",
     "@angular/router": "^8.0.0",
     "core-js": "^2.5.4",
-    "jdnconvertiblecalendar": "0.0.3",
+    "jdnconvertiblecalendar": "0.0.4",
     "rxjs": "^6.5.1",
     "zone.js": "~0.9.1"
   },
diff --git a/projects/jdnconvertible-calendar-date-adapter/src/lib/jdnconvertible-calendar-date-adapter.ts b/projects/jdnconvertible-calendar-date-adapter/src/lib/jdnconvertible-calendar-date-adapter.ts
index 8c43362..2346868 100644
--- a/projects/jdnconvertible-calendar-date-adapter/src/lib/jdnconvertible-calendar-date-adapter.ts
+++ b/projects/jdnconvertible-calendar-date-adapter/src/lib/jdnconvertible-calendar-date-adapter.ts
@@ -25,9 +25,8 @@ import {
   CalendarPeriod,
   GregorianCalendarDate,
   JDNConvertibleCalendar,
-  JDNConvertibleConversionModule,
-  JDNPeriod,
-  JulianCalendarDate
+  JulianCalendarDate,
+  IslamicCalendarDate
 } from 'jdnconvertiblecalendar';
 
 
@@ -105,6 +104,10 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
         this._activeCalendarFormat = 'Julian';
         return dateMod.convertCalendar('Julian');
 
+      case 'Islamic':
+        this._activeCalendarFormat = 'Islamic';
+        return dateMod.convertCalendar('Islamic');
+
       default:
         // invalid format
         return dateMod;
@@ -138,8 +141,11 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
   }
 
   getMonthNames(style: 'long' | 'short' | 'narrow'): string[] {
-    // TODO: implement this properly, taking calendar format and locale into account
-    return ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'];
+    if (this._activeCalendarFormat === 'Julian' || this._activeCalendarFormat === 'Gregorian') {
+      return ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'];
+    } else if (this._activeCalendarFormat === 'Islamic') {
+      return ['Muharram', 'Safar', 'Rabīʿ al Awwal','Rabīʿ al Ththānī', 'Jumādá al Ūlá', 'Jumādá al Ākhirah', 'Rajab','Sha‘bān', 'Ramadān','Shawwāl','Dhū al Qa‘dah', 'Dhū al Hijjah'];
+    }
   }
 
   getDateNames(): string[] {
@@ -153,8 +159,11 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
   }
 
   getDayOfWeekNames(style: 'long' | 'short' | 'narrow') {
-    // TODO: implement this properly, taking calendar format and locale into account
-    return ['Sun', 'Mon', 'Tue', 'Wed', 'Thur', 'Fri', 'Sat'];
+    if (this._activeCalendarFormat === 'Julian' || this._activeCalendarFormat === 'Gregorian') {
+      return ['Sun', 'Mon', 'Tue', 'Wed', 'Thur', 'Fri', 'Sat'];
+    } else if  (this._activeCalendarFormat === 'Islamic') {
+      return ['al-Aḥad', 'al-Ithnayn', 'ath-Thulāthā’', ' al-Arba‘ā’', 'al-Khamīs', 'al-Jumu\'ah', 'as-Sabt'];
+    }
   }
 
   getYearName(date: JDNConvertibleCalendar): string {
@@ -182,6 +191,9 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
       case 'Julian':
         return new JulianCalendarDate(jdnPeriod);
+
+      case 'Islamic':
+        return new IslamicCalendarDate(jdnPeriod);
     }
 
   }
@@ -205,6 +217,9 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
       case 'Julian':
         return new JulianCalendarDate(new CalendarPeriod(calDate, calDate));
+
+      case 'Islamic':
+        return new IslamicCalendarDate(new CalendarPeriod(calDate, calDate));
     }
   }
 
@@ -356,8 +371,6 @@ export class JDNConvertibleCalendarDateAdapter extends DateAdapter<JDNConvertibl
 
     const gregorianCalPeriod = gregorianCal.toCalendarPeriod();
 
-    console.log('to iso');
-
     return `${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.year, 4)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.month, 2)}-${JDNConvertibleCalendarDateAdapter.addLeadingZeroToNumber(gregorianCalPeriod.periodStart.day, 2)}`;
 
   }
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 3e2f143..2421c21 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -77,7 +77,7 @@ export class HeaderComponent<D> implements OnInit {
    *
    * @param {"Gregorian" | "Julian"} calendar the target calendar format.
    */
-  convertCalendar(calendar: 'Gregorian' | 'Julian') {
+  convertCalendar(calendar: 'Gregorian' | 'Julian' | 'Islamic') {
 
     if (this._dateAdapter instanceof JDNConvertibleCalendarDateAdapter) {
 
@@ -88,6 +88,7 @@ export class HeaderComponent<D> implements OnInit {
       this._datepickerContent.datepicker.select(convertedDate);
 
       this._calendar.updateTodaysDate();
+
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5cfd728..29da0a8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4282,10 +4282,10 @@ jasminewd2@^2.1.0:
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
-jdnconvertiblecalendar@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/jdnconvertiblecalendar/-/jdnconvertiblecalendar-0.0.3.tgz#a4e6106340b27bc06bf08cd00912960c666693cc"
-  integrity sha512-AxqmzIkHLE/iEZuej5S9zTqXOAvtHJIk6iMPM3tLBha9UBclxXqXGeqJtclMflVHuvpzm06e0zJ2YVCSA8vtQg==
+jdnconvertiblecalendar@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/jdnconvertiblecalendar/-/jdnconvertiblecalendar-0.0.4.tgz#83b9bfe0a3d589211ad13f6ac8524691817b7703"
+  integrity sha512-GmUZOcvD3ER3YaTnxkEnMToFH6Q8DpnbSM+7f+RZzDvKa/YLeiuU0gd+RWbyCxwA4mtWA/eJ9H+7HANjkjoqcA==
 
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"