diff --git a/src/components.ts b/src/components.ts
index d7468ad2d9..1ba48ed55d 100644
--- a/src/components.ts
+++ b/src/components.ts
@@ -1,53 +1,55 @@
-export * from './components/app/app';
-export * from './components/action-sheet/action-sheet';
-export * from './components/alert/alert';
-export * from './components/badge/badge';
-export * from './components/button/button';
-export * from './components/checkbox/checkbox';
-export * from './components/content/content';
-export * from './components/datetime/datetime';
-export * from './components/icon/icon';
-export * from './components/img/img';
-export * from './components/infinite-scroll/infinite-scroll';
-export * from './components/infinite-scroll/infinite-scroll-content';
-export * from './components/input/input';
-export * from './components/item/item';
-export * from './components/item/item-sliding';
-export * from './components/label/label';
-export * from './components/list/list';
-export * from './components/loading/loading';
-export * from './components/menu/menu-controller';
-export * from './components/menu/menu';
-export * from './components/menu/menu-types';
-export * from './components/menu/menu-toggle';
-export * from './components/menu/menu-close';
-export * from './components/modal/modal';
-export * from './components/nav/nav';
-export * from './components/nav/nav-controller';
-export * from './components/nav/view-controller';
-export * from './components/nav/nav-params';
-export * from './components/nav/nav-push';
-export * from './components/nav/nav-router';
-export * from './components/navbar/navbar';
-export * from './components/option/option';
-export * from './components/picker/picker';
-export * from './components/popover/popover';
-export * from './components/radio/radio-button';
-export * from './components/radio/radio-group';
-export * from './components/range/range';
-export * from './components/refresher/refresher';
-export * from './components/refresher/refresher-content';
-export * from './components/scroll/scroll';
-export * from './components/searchbar/searchbar';
-export * from './components/segment/segment';
-export * from './components/select/select';
-export * from './components/show-hide-when/show-hide-when';
-export * from './components/slides/slides';
-export * from './components/spinner/spinner';
-export * from './components/tabs/tabs';
-export * from './components/tabs/tab';
-export * from './components/tap-click/tap-click';
-export * from './components/toast/toast';
-export * from './components/toggle/toggle';
-export * from './components/toolbar/toolbar';
-export * from './components/virtual-scroll/virtual-scroll';
+export { ActionSheet, ActionSheetOptions } from './components/action-sheet/action-sheet';
+export { Alert, AlertOptions, AlertInputOptions } from './components/alert/alert';
+export { App } from './components/app/app';
+export { Backdrop } from './components/backdrop/backdrop';
+export { Badge } from './components/badge/badge';
+export { Button } from './components/button/button';
+export { Checkbox } from './components/checkbox/checkbox';
+export { Content } from './components/content/content';
+export { DateTime } from './components/datetime/datetime';
+export { Icon } from './components/icon/icon';
+export { Img } from './components/img/img';
+export { InfiniteScroll } from './components/infinite-scroll/infinite-scroll';
+export { InfiniteScrollContent } from './components/infinite-scroll/infinite-scroll-content';
+export { TextArea, TextInput } from './components/input/input';
+export { Item } from './components/item/item';
+export { ItemReorder } from './components/item/item-reorder';
+export { ItemSliding, ItemOptions, ItemSideFlags } from './components/item/item-sliding';
+export { Label } from './components/label/label';
+export { List, ListHeader } from './components/list/list';
+export { Loading, LoadingOptions } from './components/loading/loading';
+export { Menu } from './components/menu/menu';
+export { MenuClose } from './components/menu/menu-close';
+export { MenuController } from './components/menu/menu-controller';
+export { MenuToggle } from './components/menu/menu-toggle';
+export { MenuType } from './components/menu/menu-types';
+export { Modal, ModalOptions } from './components/modal/modal';
+export { Nav } from './components/nav/nav';
+export { NavController, NavOptions } from './components/nav/nav-controller';
+export { NavParams } from './components/nav/nav-params';
+export { NavPop } from './components/nav/nav-pop';
+export { NavPush } from './components/nav/nav-push';
+export { ViewController } from './components/nav/view-controller';
+export { Navbar, NavbarTemplate } from './components/navbar/navbar';
+export { Option } from './components/option/option';
+export { Picker, PickerOptions, PickerColumn, PickerColumnOption } from './components/picker/picker';
+export { Popover, PopoverOptions } from './components/popover/popover';
+export { RadioButton } from './components/radio/radio-button';
+export { RadioGroup } from './components/radio/radio-group';
+export { Range, RangeKnob, ClientRect } from './components/range/range';
+export { Refresher } from './components/refresher/refresher';
+export { RefresherContent } from './components/refresher/refresher-content';
+export { Scroll } from './components/scroll/scroll';
+export { Searchbar } from './components/searchbar/searchbar';
+export { Segment, SegmentButton } from './components/segment/segment';
+export { Select } from './components/select/select';
+export { ShowWhen, HideWhen, DisplayWhen } from './components/show-hide-when/show-hide-when';
+export { Slides, Slide, SlideLazy } from './components/slides/slides';
+export { Spinner } from './components/spinner/spinner';
+export { Tab } from './components/tabs/tab';
+export { Tabs } from './components/tabs/tabs';
+export { TapClick, isActivatable } from './components/tap-click/tap-click';
+export { Toast, ToastOptions } from './components/toast/toast';
+export { Toggle } from './components/toggle/toggle';
+export { Toolbar, ToolbarBase, Header, Footer } from './components/toolbar/toolbar';
+export { VirtualScroll } from './components/virtual-scroll/virtual-scroll';