diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index a696c4ac6d..b59403cc39 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -1,1123 +1,125 @@
-// Type definitions for react-bootstrap
+// Type definitions for react-bootstrap 0.31
 // Project: https://github.com/react-bootstrap/react-bootstrap
-// Definitions by: Walker Burgin <https://github.com/walkerburgin>, Vincent Siao <https://github.com/vsiao>, Danilo Barros <https://github.com/danilojrr>, Batbold Gansukh <https://github.com/Batbold-Gansukh>, Raymond May Jr. <https://github.com/octatone>, Cheng Sieu Ly <https://github.com/chengsieuly>, Kat Busch <https://github.com/katbusch>
+// Definitions by: Walker Burgin <https://github.com/walkerburgin>,
+//                 Vincent Siao <https://github.com/vsiao>,
+//                 Danilo Barros <https://github.com/danilojrr>,
+//                 Batbold Gansukh <https://github.com/Batbold-Gansukh>,
+//                 Raymond May Jr. <https://github.com/octatone>,
+//                 Cheng Sieu Ly <https://github.com/chengsieuly>,
+//                 Kat Busch <https://github.com/katbusch>,
+//                 Vito Samson <https://github.com/vitosamson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as React from 'react';
-export = ReactBootstrap;
-export as namespace ReactBootstrap;
 
-declare namespace ReactBootstrap {
+export type Sizes = 'xs' | 'xsmall' | 'sm' | 'small' | 'medium' | 'lg' | 'large';
 
-    type Sizes = 'xs' | 'xsmall' | 'sm' | 'small' | 'medium' | 'lg' | 'large';
-
-
-    // Change onSelect signature to be (eventKey: any, event: SyntheticEvent<{}>) => any on all React-Bootstrap components, instead of the old inconsistent mishmash (#1604, #1677, #1756)
-    /** ( eventKey:any, e:React.SyntheticEvent<{}> ):void */
-    interface SelectCallback extends React.EventHandler<any> {
-        (eventKey: any, e: React.SyntheticEvent<{}>): void;
-        /**
-            @deprecated
-            This signature is a hack so can still derive from HTMLProps.
-            It does not reflect the underlying event and should not be used.
-        */
-        (e: React.MouseEvent<{}>): void;
-    }
-
-
-    interface TransitionCallbacks {
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-    }
-
-
-    // <Accordion />
-    interface AccordionProps extends React.HTMLProps<Accordion> {
-        bsSize?: Sizes;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: any; // TODO: Add more specific type
-        header?: any; // TODO: Add more specific type
-    }
-    type Accordion = React.ClassicComponent<AccordionProps>;
-    var Accordion: React.ClassicComponentClass<AccordionProps>;
-
-
-    // <Breadcrumb />
-    interface BreadcrumbProps extends React.Props<Breadcrumb> {
-        bsClass?: string;
-    }
-    interface BreadcrumbClass extends React.ClassicComponentClass<BreadcrumbProps> {
-        Item: typeof BreadcrumbItem;
-    }
-    type Breadcrumb = React.ClassicComponent<BreadcrumbProps>;
-    var Breadcrumb: BreadcrumbClass;
-
-
-    // <BreadcrumbItem />
-    interface BreadcrumbItemProps extends React.Props<BreadcrumbItem> {
-        active?: boolean;
-        id?: string | number;
-        href?: string;
-        title?: React.ReactNode;
-        target?: string;
-    }
-    type BreadcrumbItem = React.ClassicComponent<BreadcrumbItemProps>;
-    var BreadcrumbItem: React.ClassicComponentClass<BreadcrumbItemProps>;
-
-
-    // <Button />
-    interface ButtonProps extends React.HTMLProps<Button> {
-        bsClass?: string;
-        active?: boolean;
-        block?: boolean;
-        bsStyle?: string;
-        bsSize?: Sizes;
-        componentClass?: React.ReactType;
-        disabled?: boolean;
-    }
-    type Button = React.ClassicComponent<ButtonProps>;
-    var Button: React.ClassicComponentClass<ButtonProps>;
-
-
-    // <ButtonToolbar />
-    interface ButtonToolbarProps extends React.HTMLProps<ButtonToolbar> {
-        block?: boolean;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonToolbar = React.ClassicComponent<ButtonToolbarProps>;
-    var ButtonToolbar: React.ClassicComponentClass<ButtonToolbarProps>;
-
-
-    // <ButtonGroup />
-    interface ButtonGroupProps extends React.HTMLProps<ButtonGroup> {
-        block?: boolean;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        justified?: boolean;
-        vertical?: boolean;
-    }
-    type ButtonGroup = React.ClassicComponent<ButtonGroupProps>;
-    var ButtonGroup: React.ClassicComponentClass<ButtonGroupProps>;
-
-
-    // <SafeAnchor />
-    interface SafeAnchorProps extends React.HTMLProps<SafeAnchor> {
-        href?: string;
-        onClick?: React.MouseEventHandler<{}>;
-        disabled?: boolean;
-        role?: string;
-        componentClass?: React.ReactType;
-    }
-    type SafeAnchor = React.ClassicComponent<SafeAnchorProps>;
-    const SafeAnchor: React.ClassicComponentClass<SafeAnchorProps>;
-
-
-    // <Checkbox />
-    interface CheckboxProps extends React.HTMLProps<Checkbox> {
-        bsClass?: string;
-        disabled?: boolean;
-        inline?: boolean;
-        inputRef?: (instance: HTMLInputElement) => void;
-        validationState?: "success" | "warning" | "error";
-    }
-    class Checkbox extends React.Component<CheckboxProps> { }
-
-
-    // <Clearfix />
-    interface ClearfixProps extends React.HTMLProps<Clearfix> {
-        componentClass?: React.ReactType,
-        visibleXsBlock?: boolean;
-        visibleSmBlock?: boolean;
-        visibleMdBlock?: boolean;
-        visibleLgBlock?: boolean;
-    }
-    class Clearfix extends React.Component<ClearfixProps> { }
-
-
-    // <Collapse />
-    interface CollapseProps extends TransitionCallbacks, React.Props<Collapse> {
-        dimension?: 'height' | 'width' | { ( ):string };
-        getDimensionValue?: ( dimension:number, element:React.ReactElement<any> ) => number;
-        in?: boolean;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Collapse extends React.Component<CollapseProps> { }
-
-
-    // <Dropdown />
-    interface DropdownBaseProps {
-        bsClass?: string;
-        componentClass?: React.ReactType;
-        disabled?: boolean;
-        dropup?: boolean;
-        id: string;
-        onClose?: Function;
-        onSelect?: SelectCallback;
-        onToggle?: (isOpen: boolean) => void;
-        open?: boolean;
-        pullRight?: boolean;
-        role?: string;
-    }
-    type DropdownProps = DropdownBaseProps & React.HTMLProps<Dropdown>;
-    class Dropdown extends React.Component<DropdownProps> {
-        public static Menu: typeof DropdownMenu;
-        public static Toggle: typeof DropdownToggle;
-    }
-
-
-    // <DropdownButton />
-    interface DropdownButtonBaseProps extends DropdownBaseProps {
-        block?: boolean;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        navItem?: boolean;
-        noCaret?: boolean;
-        pullRight?: boolean;
-    }
-    type DropdownButtonProps = DropdownButtonBaseProps & React.HTMLProps<DropdownButton>;
-    class DropdownButton extends React.Component<DropdownButtonProps> { }
-
-
-    // <Dropdown.Menu />
-    interface DropdownMenuProps extends React.HTMLProps<DropdownMenu> {
-        labelledBy?: string | number;
-        onClose?: Function;
-        onSelect?: SelectCallback;
-        open?: boolean;
-        pullRight?: boolean;
-    }
-    class DropdownMenu extends React.Component<DropdownMenuProps> { }
-
-
-    // <Dropdown.Toggle />
-    interface DropdownToggleProps extends React.HTMLProps<DropdownToggle> {
-        bsRole?: string;
-        noCaret?: boolean;
-        open?: boolean;
-        title?: string;
-        useAnchor?: boolean;
-        bsClass?:string; // Added since v0.30.0
-        bsStyle?:string;
-    }
-    class DropdownToggle extends React.Component<DropdownToggleProps> { }
-
-
-    // <Fade />
-    interface FadeProps extends TransitionCallbacks, React.Props<Fade> {
-        in?: boolean;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Fade extends React.Component<FadeProps> { }
-
-
-    // <MenuItem />
-    interface MenuItemProps extends React.HTMLProps<MenuItem> {
-        active?: boolean;
-        bsClass?: string;
-        disabled?: boolean;
-        divider?: boolean;
-        eventKey?: any;
-        header?: boolean;
-        onClick?: React.MouseEventHandler<{}>;
-        onSelect?: SelectCallback;
-        target?: string;
-        title?: string;
-    }
-    class MenuItem extends React.Component<MenuItemProps> { }
-
-
-    // <Panel />
-    interface PanelProps extends TransitionCallbacks, React.HTMLProps<Panel> {
-        bsClass?: string;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        collapsible?: boolean;
-        defaultExpanded?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        footer?: React.ReactNode;
-        header?: React.ReactNode;
-        onSelect?: SelectCallback;
-    }
-    type Panel = React.ClassicComponent<PanelProps>;
-    var Panel: React.ClassicComponentClass<PanelProps>;
-
-
-    // <PanelGroup />
-    interface PanelGroupProps extends React.HTMLProps<PanelGroup> {
-        accordion?: boolean;
-        activeKey?: any;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-        onSelect?: SelectCallback;
-    }
-    type PanelGroup = React.ClassicComponent<PanelGroupProps>;
-    var PanelGroup: React.ClassicComponentClass<PanelGroupProps>;
-
-
-    // <SplitButton />
-    interface SplitButtonProps extends React.HTMLProps<SplitButton> {
-        bsStyle?: string;
-        bsSize?: Sizes;
-        dropdownTitle?: any; // TODO: Add more specific type
-        dropup?: boolean;
-        pullRight?: boolean;
-    }
-    class SplitButton extends React.Component<SplitButtonProps> { }
-
-
-    // <Modal.Dialog />
-    interface ModalDialogProps extends React.HTMLProps<ModalDialog> {
-        // TODO: Add more specific type
-        onHide?: Function;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-    }
-    type ModalDialog = React.ClassicComponent<ModalDialogProps>;
-    var ModalDialog: React.ClassicComponentClass<ModalDialogProps>;
-
-
-    // <Modal.Header />
-    interface ModalHeaderProps extends React.HTMLProps<ModalHeader> {
-        closeButton?: boolean;
-        modalClassName?: string;
-        onHide?: Function;
-        // undefined?: string;
-    }
-    class ModalHeader extends React.Component<ModalHeaderProps> {
-    }
-
-
-    // <Modal.Title/>
-    interface ModalTitleProps extends React.HTMLProps<ModalTitle> {
-        modalClassName?: string;
-    }
-    class ModalTitle extends React.Component<ModalTitleProps> {
-    }
-
-    // <Modal.Body />
-    interface ModalBodyProps extends React.HTMLProps<ModalBody> {
-        modalClassName?: string;
-    }
-    class ModalBody extends React.Component<ModalBodyProps> {
-    }
-
-    // <Modal.Footer />
-    interface ModalFooterProps extends React.HTMLProps<ModalFooter> {
-        modalClassName?: string;
-    }
-    class ModalFooter extends React.Component<ModalFooterProps> {
-    }
-
-    // <Modal />
-    interface ModalProps extends React.HTMLProps<Modal> {
-        // Required
-        onHide: Function;
-
-        // Optional
-        animation?: boolean;
-        autoFocus?: boolean;
-        backdrop?: boolean | string;
-        backdropClassName?: string;
-        backdropStyle?: any;
-        backdropTransitionTimeout?: number;
-        bsSize?: Sizes;
-        container?: any; // TODO: Add more specific type
-        containerClassName?: string;
-        dialogClassName?: string;
-        dialogComponent?: any; // TODO: Add more specific type
-        dialogTransitionTimeout?: number;
-        enforceFocus?: boolean;
-        keyboard?: boolean;
-        onBackdropClick?: (node: HTMLElement) => any;
-        onEnter?: (node: HTMLElement) => any;
-        onEntered?: (node: HTMLElement) => any;
-        onEntering?: (node: HTMLElement) => any;
-        onEscapeKeyUp?: (node: HTMLElement) => any;
-        onExit?: (node: HTMLElement) => any;
-        onExited?: (node: HTMLElement) => any;
-        onExiting?: (node: HTMLElement) => any;
-        onShow?: (node: HTMLElement) => any;
-        show?: boolean;
-        transition?: React.ReactElement<any>;
-    }
-    interface ModalClass extends React.ClassicComponentClass<ModalProps> {
-        Body: typeof ModalBody;
-        Header: typeof ModalHeader;
-        Title: typeof ModalTitle;
-        Footer: typeof ModalFooter;
-        Dialog: typeof ModalDialog;
-    }
-    type Modal = React.ClassicComponent<ModalProps>;
-    var Modal: ModalClass;
-
-    // <OverlayTrigger />
-    interface OverlayTriggerProps {
-        // Required
-        overlay: any; // TODO: Add more specific type
-
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number;
-        defaultOverlayShown?: boolean;
-        delay?: number;
-        delayHide?: number;
-        delayShow?: number;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        trigger?: string | string[];
-    }
-    type OverlayTrigger = React.ClassicComponent<OverlayTriggerProps>;
-    var OverlayTrigger: React.ClassicComponentClass<OverlayTriggerProps>;
-
-    // <Tooltip />
-    interface TooltipProps extends React.HTMLProps<Tooltip> {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number;
-        positionTop?: number;
-    }
-    type Tooltip = React.ClassicComponent<TooltipProps>;
-    var Tooltip: React.ClassicComponentClass<TooltipProps>;
-
-    // <Popover/>
-    interface PopoverProps extends React.HTMLProps<Popover> {
-        // Optional
-        arrowOffsetLeft?: number | string;
-        arrowOffsetTop?: number | string;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        placement?: string;
-        positionLeft?: number | string; // String support added since v0.30.0
-        positionTop?: number | string; // String support added since v0.30.0
-    }
-    type Popover = React.ClassicComponent<PopoverProps>;
-    var Popover: React.ClassicComponentClass<PopoverProps>;
-
-    // <Overlay />
-    interface OverlayProps {
-        // Optional
-        animation?: any; // TODO: Add more specific type
-        container?: any; // TODO: Add more specific type
-        containerPadding?: number; // TODO: Add more specific type
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        onHide?: Function;
-        placement?: string;
-        rootClose?: boolean;
-        show?: boolean;
-        target?: Function | React.ReactInstance;
-        shouldUpdatePosition?: boolean;
-    }
-    class Overlay extends React.Component<OverlayProps> {
-    }
-
-    // <ProgressBar />
-    interface ProgressBarProps extends React.HTMLProps<ProgressBar> {
-        // Optional
-        active?: boolean;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        interpolatedClass?: any; // TODO: Add more specific type
-        max?: number;
-        min?: number;
-        now?: number;
-        srOnly?: boolean;
-        striped?: boolean;
-    }
-    class ProgressBar extends React.Component<ProgressBarProps> {
-    }
-
-    // <Nav />
-    // TODO: This one turned into a union of two different types
-    interface NavProps extends React.HTMLProps<Nav> {
-        // Optional
-        activeHref?: string;
-        activeKey?: any;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        collapsible?: boolean;
-        eventKey?: any;
-        expanded?: boolean;
-        justified?: boolean;
-        navbar?: boolean;
-        pullRight?: boolean;
-        right?: boolean;
-        stacked?: boolean;
-        ulClassName?: string;
-        ulId?: string;
-    }
-    class Nav extends React.Component<NavProps> {
-    }
-
-    // <NavItem />
-    interface NavItemProps extends React.HTMLProps<NavItem> {
-        active?: boolean;
-        brand?: any; // TODO: Add more specific type
-        bsSize?: Sizes;
-        bsStyle?: string;
-        componentClass?: React.ReactType;
-        defaultNavExpanded?: boolean;
-        eventKey?: any;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        linkId?: string;
-        navExpanded?: boolean;
-        onSelect?: SelectCallback;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    type NavItem = React.ClassicComponent<NavItemProps>;
-    var NavItem: React.ClassicComponentClass<NavItemProps>;
-
-    // <Navbar.Brand />
-    interface NavbarBrandProps extends React.HTMLProps<NavbarBrand> {
-    }
-    class NavbarBrand extends React.Component<NavbarBrandProps> {
-    }
-
-    // <Navbar.Collapse />
-    interface NavbarCollapseProps {
-    }
-    type NavbarCollapse = React.ClassicComponent<NavbarCollapseProps>;
-    var NavbarCollapse: React.ClassicComponentClass<NavbarCollapseProps>;
-
-    // <Navbar.Header />
-    interface NavbarHeaderProps extends React.HTMLProps<NavbarHeader> {
-    }
-    type NavbarHeader = React.ClassicComponent<NavbarHeaderProps>;
-    var NavbarHeader: React.ClassicComponentClass<NavbarHeaderProps>;
-
-    // <Navbar.Toggle />
-    interface NavbarToggleProps {
-        onClick?: React.MouseEventHandler<HTMLButtonElement>;
-    }
-    type NavbarToggle = React.ClassicComponent<NavbarToggleProps>;
-    var NavbarToggle: React.ClassicComponentClass<NavbarToggleProps>;
-
-    // <Navbar.Link />
-    interface NavbarLinkProps {
-        href: string;
-        onClick?: React.MouseEventHandler<HTMLAnchorElement>;
-    }
-    type NavbarLink = React.ClassicComponent<NavbarLinkProps>;
-    const NavbarLink: React.ClassicComponentClass<NavbarLinkProps>;
-
-    // <Navbar.Text />
-    interface NavbarTextProps {
-        pullRight?: boolean;
-    }
-    type NavbarText = React.ClassicComponent<NavbarTextProps>;
-    const NavbarText: React.ClassicComponentClass<NavbarTextProps>;
-
-    // <Navbar.Form />
-    interface NavbarFormProps extends React.HTMLProps<NavbarForm> {
-        componentClass?: React.ReactType;
-        pullRight?: boolean;
-    }
-    type NavbarForm = React.ClassicComponent<NavbarFormProps>;
-    const NavbarForm: React.ClassicComponentClass<NavbarFormProps>;
-
-    // <Navbar />
-    interface NavbarProps extends React.HTMLProps<Navbar> {
-        brand?: any; // TODO: Add more specific type
-        bsSize?: Sizes;
-        bsStyle?: string;
-        collapseOnSelect?: boolean;
-        componentClass?: React.ReactType;
-        defaultNavExpanded?: boolean;
-        fixedBottom?: boolean;
-        fixedTop?: boolean;
-        fluid?: boolean;
-        inverse?: boolean;
-        navExpanded?: boolean;
-        onToggle?: Function;
-        staticTop?: boolean;
-        toggleButton?: any; // TODO: Add more specific type
-        toggleNavKey?: string | number;
-    }
-    interface NavbarClass extends React.ClassicComponentClass<NavbarProps> {
-        Brand: typeof NavbarBrand;
-        Collapse: typeof NavbarCollapse;
-        Header: typeof NavbarHeader;
-        Toggle: typeof NavbarToggle;
-        Link: typeof NavbarLink;
-        Text: typeof NavbarText;
-        Form: typeof NavbarForm;
-    }
-    type Navbar = React.ClassicComponent<NavbarProps>;
-    var Navbar: NavbarClass;
-
-
-    // <NavDropdown />
-    interface NavDropdownBaseProps extends DropdownBaseProps {
-        active?: boolean;
-        noCaret?: boolean;
-        eventKey?: any;
-    }
-    type NavDropdownProps = NavDropdownBaseProps & React.HTMLProps<NavDropdown>;
-    class NavDropdown extends React.Component<NavDropdownProps> { }
-
-    // <Tabs />
-    interface TabsProps extends React.HTMLProps<Tabs> {
-        activeKey?: any;
-        animation?: boolean;
-        bsStyle?: string;
-        defaultActiveKey?: any;
-        onSelect?: SelectCallback;
-        paneWidth?: any; // TODO: Add more specific type
-        position?: string;
-        tabWidth?: any; // TODO: Add more specific type
-        unmountOnExit?: boolean;
-        justified?: boolean;
-    }
-    type Tabs = React.ClassicComponent<TabsProps>;
-    var Tabs: React.ClassicComponentClass<TabsProps>;
-
-    // <Tab />
-    interface TabProps extends React.HTMLProps<Tab> {
-        animation?: boolean;
-        'aria-labelledby'?:string;
-        bsClass?:string;
-        eventKey?: any; // TODO: Add more specific type
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        unmountOnExit?: boolean;
-        tabClassName?:string;
-    }
-    interface TabClass extends React.ClassicComponentClass<TabProps> {
-        Container: TabContainer;
-        Pane: TabPane;
-        Content: TabClass;
-    }
-    type Tab = TabClass;
-    var Tab: TabClass;
-
-    // <Tab.Container />
-    // ----------------------------------------
-    interface TabContainerProps extends React.HTMLAttributes<{}> {
-        activeKey?: any;
-        defaultActiveKey?: any;
-        generateChildId?: (eventKey: any, type: any) => string;
-    }
-    type TabContainer = React.ClassicComponentClass<TabContainerProps>;
-
-    // <Tab.Pane />
-    // ----------------------------------------
-    interface TabPaneProps extends React.HTMLAttributes<{}> {
-        animation?: boolean | React.ComponentClass<any>;
-        'aria-labelledby'?: string;
-        bsClass?: string;
-        eventKey?: any;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        unmountOnExit?: boolean;
-    }
-    type TabPane = React.ClassicComponentClass<TabPaneProps>;
-
-
-    // <Pager />
-    interface PagerProps extends React.HTMLProps<Pager> {
-        onSelect?: SelectCallback;
-    }
-    interface PagerClass extends React.ClassicComponentClass<PagerProps> {
-        Item: typeof PageItem // Added since v0.30.0
-    }
-    type Pager = React.ClassicComponent<PagerProps>;
-    var Pager: PagerClass;
-
-
-    // <PageItem />
-    interface PageItemProps extends React.HTMLProps<PageItem> {
-        disabled?: boolean;
-        eventKey?: any;
-        next?: boolean;
-        onSelect?: SelectCallback;
-        previous?: boolean;
-        target?: string;
-    }
-    type PageItem = React.ClassicComponent<PageItemProps>;
-    /** @deprecated since v0.30.0, should use <Pager.Item> instead of <PageItem>*/
-    var PageItem: React.ClassicComponentClass<PageItemProps>;
-
-
-    // <Pagination />
-    interface PaginationProps extends React.HTMLProps<Pagination> {
-        activePage?: number;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        boundaryLinks?: boolean;
-        buttonComponentClass?: React.ReactType;
-        ellipsis?: React.ReactNode;
-        first?: React.ReactNode;
-        items?: number;
-        last?: React.ReactNode;
-        maxButtons?: number;
-        next?: React.ReactNode;
-        onSelect?: SelectCallback;
-        prev?: React.ReactNode;
-    }
-    type Pagination = React.ClassicComponent<PaginationProps>;
-    var Pagination: React.ClassicComponentClass<PaginationProps>;
-
-
-    // <Alert />
-    interface AlertProps extends React.HTMLProps<Alert> {
-        bsSize?: Sizes;
-        bsStyle?: string;
-        closeLabel?: string;
-        /** @deprecated since v0.29.0 */ dismissAfter?: number;
-        onDismiss?: Function;
-    }
-    type Alert = React.ClassicComponent<AlertProps>;
-    var Alert: React.ClassicComponentClass<AlertProps>;
-
-
-    // <Carousel />
-    interface CarouselProps extends React.HTMLProps<Carousel> {
-        activeIndex?: number;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        controls?: boolean;
-        defaultActiveIndex?: number;
-        direction?: string;
-        indicators?: boolean;
-        interval?: number;
-        nextIcon?: React.ReactNode;
-        onSelect?: SelectCallback;
-        onSlideEnd?: Function;
-        pauseOnHover?: boolean;
-        prevIcon?: React.ReactNode;
-        slide?: boolean;
-        // wrap?: boolean;
-    }
-    interface CarouselClass extends React.ClassicComponentClass<CarouselProps> {
-        Caption: typeof CarouselCaption;
-        Item: typeof CarouselItem;
-    }
-    type Carousel = React.ClassicComponent<CarouselProps>;
-    var Carousel: CarouselClass;
-
-    // <CarouselItem />
-    interface CarouselItemProps extends React.HTMLProps<CarouselItem> {
-        active?: boolean;
-        animtateIn?: boolean;
-        animateOut?: boolean;
-        direction?: string;
-        index?: number;
-        onAnimateOutEnd?: Function;
-    }
-    type CarouselItem = React.ClassicComponent<CarouselItemProps>;
-    var CarouselItem: React.ClassicComponentClass<CarouselItemProps>;
-
-    // <CarouselCaption />
-    interface CarouselCaptionProps extends React.HTMLProps<CarouselCaption> {
-        componentClass?: React.ReactType;
-    }
-    type CarouselCaption = React.ClassicComponent<CarouselCaptionProps>;
-    var CarouselCaption: React.ClassicComponentClass<CarouselCaptionProps>;
-
-    // <Grid />
-    interface GridProps extends React.HTMLProps<Grid> {
-        componentClass?: React.ReactType;
-        fluid?: boolean;
-        bsClass?: string;
-    }
-    type Grid = React.ClassicComponent<GridProps>;
-    var Grid: React.ClassicComponentClass<GridProps>;
-
-    // <Row />
-    interface RowProps extends React.HTMLProps<Row> {
-        componentClass?: React.ReactType;
-    }
-    type Row = React.ClassicComponent<RowProps>;
-    var Row: React.ClassicComponentClass<RowProps>;
-
-    // <Col />
-    interface ColProps extends React.HTMLProps<Col> {
-        componentClass?: React.ReactType;
-        lg?: number;
-        lgHidden?: boolean;
-        lgOffset?: number;
-        lgPull?: number;
-        lgPush?: number;
-        md?: number;
-        mdHidden?: boolean;
-        mdOffset?: number;
-        mdPull?: number;
-        mdPush?: number;
-        sm?: number;
-        smHidden?: boolean;
-        smOffset?: number;
-        smPull?: number;
-        smPush?: number;
-        xs?: number;
-        xsHidden?: boolean;
-        xsOffset?: number;
-        xsPull?: number;
-        xsPush?: number;
-    }
-    type Col = React.ClassicComponent<ColProps>;
-    var Col: React.ClassicComponentClass<ColProps>;
-
-    // <Thumbnail />
-    interface ThumbnailProps extends React.HTMLProps<Thumbnail> {
-        bsSize?: Sizes;
-        bsStyle?: string;
-    }
-    type Thumbnail = React.ClassicComponent<ThumbnailProps>;
-    var Thumbnail: React.ClassicComponentClass<ThumbnailProps>;
-
-    // <ListGroup />
-    interface ListGroupProps extends React.HTMLProps<ListGroup> {
-        componentClass?: React.ReactType; // Added since v0.30.0
-        fill?: boolean; // TODO: Add more specific type
-    }
-    class ListGroup extends React.Component<ListGroupProps> {
-    }
-
-    // <ListGroupItem />
-    interface ListGroupItemProps extends React.HTMLProps<ListGroupItem> {
-        active?: any;
-        bsSize?: Sizes;
-        bsStyle?: string;
-        eventKey?: any;
-        header?: any; // TODO: Add more specific type
-        key?: any; // TODO: Add more specific type
-        listItem?: boolean;
-    }
-    class ListGroupItem extends React.Component<ListGroupItemProps> {
-    }
-
-    // <Label />
-    interface LabelProps extends React.HTMLProps<Label> {
-        bsSize?: Sizes;
-        bsStyle?: string;
-    }
-    class Label extends React.Component<LabelProps> {
-    }
-
-    // <Badge />
-    interface BadgeProps extends React.HTMLProps<Badge> {
-        bsClass?: string;
-        pullRight?: boolean;
-    }
-    type Badge = React.ClassicComponent<BadgeProps>;
-    var Badge: React.ClassicComponentClass<BadgeProps>;
-
-    // <Jumbotron />
-    interface JumbotronProps extends React.HTMLProps<Jumbotron> {
-        componentClass?: React.ReactType;
-    }
-    type Jumbotron = React.ClassicComponent<JumbotronProps>;
-    var Jumbotron: React.ClassicComponentClass<JumbotronProps>;
-
-    // <Image />
-    interface ImageProps extends React.HTMLProps<Image> {
-        circle?: boolean;
-        responsive?: boolean;
-        rounded?: boolean;
-        thumbnail?: boolean;
-    }
-    type Image = React.ClassicComponent<ImageProps>;
-    var Image: React.ClassicComponentClass<ImageProps>;
-
-    // <ResponsiveEmbed />
-    interface ResponsiveEmbedProps extends React.HTMLProps<ResponsiveEmbed> {
-        a16by9?: boolean;
-        a4by3?: boolean;
-        bsClass?: string;
-    }
-    class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps> {
-    }
-
-    // <PageHeader />
-    interface PageHeaderProps extends React.HTMLProps<PageHeader> {
-    }
-    class PageHeader extends React.Component<PageHeaderProps> {
-    }
-
-    // <Well />
-    interface WellProps extends React.HTMLProps<Well> {
-        bsSize?: Sizes;
-        bsStyle?: string;
-    }
-    class Well extends React.Component<WellProps> {
-    }
-
-    // <Glyphicon />
-    interface GlyphiconProps extends React.HTMLProps<Glyphicon> {
-        // Required
-        glyph: string;
-    }
-    type Glyphicon = React.ClassicComponent<GlyphiconProps>;
-    var Glyphicon: React.ClassicComponentClass<GlyphiconProps>;
-
-    // <Table />
-    interface TableProps extends React.HTMLProps<Table> {
-        bordered?: boolean;
-        condensed?: boolean;
-        hover?: boolean;
-        responsive?: boolean;
-        striped?: boolean;
-        fill?: boolean;
-        bsClass?: string;
-    }
-    type Table = React.ClassicComponent<TableProps>;
-    var Table: React.ClassicComponentClass<TableProps>;
-
-    // <InputGroup />
-    interface InputGroupProps extends React.HTMLProps<InputGroup> {
-        bsClass?: string;
-        bsSize?: Sizes;
-    }
-    interface InputGroupClass extends React.ClassicComponentClass<InputGroupProps> {
-        Addon: typeof InputGroupAddon;
-        Button: typeof InputGroupButton;
-    }
-    type InputGroup = React.Component<InputGroupProps>;
-    var InputGroup: InputGroupClass;
-
-
-    // <InputGroup.Addon />
-    interface InputGroupAddonProps extends React.HTMLProps<InputGroupAddon> { }
-    type InputGroupAddon = React.ClassicComponent<InputGroupAddonProps>;
-    var InputGroupAddon: React.ClassicComponentClass<InputGroupAddonProps>;
-
-
-    // <InputGroup.Button />
-    interface InputGroupButtonProps extends React.HTMLProps<InputGroupButton> { }
-    type InputGroupButton = React.ClassicComponent<InputGroupButtonProps>;
-    var InputGroupButton: React.ClassicComponentClass<InputGroupButtonProps>;
-
-
-    // <Form />
-    interface FormProps extends React.HTMLProps<Form> {
-        bsClass?: string;
-        componentClass?: React.ReactType;
-        horizontal?: boolean;
-        inline?: boolean;
-    }
-    class Form extends React.Component<FormProps> { }
-
-    // <FormGroup />
-    interface FormGroupProps extends React.HTMLProps<FormGroup> {
-        bsClass?: string;
-        bsSize?: Sizes;
-        controlId?: string;
-        validationState?: "success" | "warning" | "error";
-    }
-    class FormGroup extends React.Component<FormGroupProps> { }
-
-    // <ControlLabel />
-    interface ControlLabelProps extends React.HTMLProps<ControlLabel> {
-        bsClass?: string;
-        htmlFor?: string;
-        srOnly?: boolean;
-    }
-    class ControlLabel extends React.Component<ControlLabelProps> { }
-
-    // <FormControl />
-    interface FormControlProps extends React.HTMLProps<FormControl> {
-        bsClass?: string;
-        bsSize?: Sizes;
-        componentClass?: React.ReactType;
-        id?: string;
-        inputRef?: (instance: HTMLInputElement) => void;
-        type?: string;
-    }
-    interface FormControlClass extends React.ClassicComponentClass<FormControlProps> {
-        Feedback: typeof FormControlFeedback;
-        Static: typeof FormControlStatic;
-    }
-    type FormControl = React.Component<FormControlProps>;
-    var FormControl: FormControlClass;
-
-    // <FormControl.Feedback />
-    interface FormControlFeedbackProps extends React.HTMLProps<FormControlFeedback> {
-    }
-    class FormControlFeedback extends React.Component<FormControlFeedbackProps> {
-    }
-
-    // <FormControl.Static />
-    interface FormControlStaticProps extends React.HTMLProps<FormControlStatic> {
-        bsClass?: string;
-        componentClass?: React.ReactType;
-    }
-    class FormControlStatic extends React.Component<FormControlStaticProps> { }
-
-
-    // <HelpBlock />
-    interface HelpBlockProps extends React.HTMLProps<HelpBlock> {
-        bsClass?: string;
-    }
-    class HelpBlock extends React.Component<HelpBlockProps> { }
-
-
-    // <Radio />
-    interface RadioProps extends React.HTMLProps<Radio> {
-        bsClass?: string;
-        disabled?: boolean;
-        inline?: boolean;
-        inputRef?: (instance: HTMLInputElement) => void;
-        validationState?: "success" | "warning" | "error";
-    }
-    class Radio extends React.Component<RadioProps> { }
-
-
-    // <Portal />
-    interface PortalProps extends React.Props<Portal> {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        onEnter?: Function;
-        onEntered?: Function;
-        onEntering?: Function;
-        onExit?: Function;
-        onExited?: Function;
-        onExiting?: Function;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    type Portal = React.ClassicComponent<PortalProps>;
-    var Portal: React.ClassicComponentClass<PortalProps>;
-
-    // <Position />
-    interface PositionProps extends TransitionCallbacks, React.Props<Position> {
-        dimension?: string | Function;
-        getDimensionValue?: Function;
-        in?: boolean;
-        role?: string;
-        timeout?: number;
-        transitionAppear?: boolean;
-        unmountOnExit?: boolean;
-    }
-    class Position extends React.Component<PositionProps> {
-    }
-    // <Media.Left />
-    interface MediaLeftProps {
-        align?: string;
-    }
-    type MediaLeft = React.ClassicComponent<MediaLeftProps>;
-    var MediaLeft: React.ClassicComponentClass<MediaLeftProps>;
-
-    // <Media.Right />
-    interface MediaRightProps {
-        align?: string;
-    }
-    type MediaRight = React.ClassicComponent<MediaRightProps>;
-    var MediaRight: React.ClassicComponentClass<MediaRightProps>;
-
-    // <Media.Heading />
-    interface MediaHeadingProps {
-        componentClass?: React.ReactType;
-    }
-    type MediaHeading = React.ClassicComponent<MediaHeadingProps>;
-    var MediaHeading: React.ClassicComponentClass<MediaHeadingProps>;
-
-    // <Media.Body />
-    interface MediaBodyProps {
-        componentClass?: React.ReactType;
-    }
-    type MediaBody = React.ClassicComponent<MediaBodyProps>;
-    var MediaBody: React.ClassicComponentClass<MediaBodyProps>;
-
-    // <Media.List />
-    interface MediaListProps {
-    }
-    type MediaList = React.ClassicComponent<MediaListProps>;
-    var MediaList: React.ClassicComponentClass<MediaListProps>;
-
-    // <Media.ListItem />
-    interface MediaListItemProps {
-        componentClass?: React.ReactType;
-    }
-    type MediaListItem = React.ClassicComponent<MediaListItemProps>;
-    var MediaListItem: React.ClassicComponentClass<MediaListItemProps>;
-
-    // <Media />
-    interface MediaProps extends React.HTMLProps<Media> {
-        componentClass?: React.ReactType;
-    }
-    interface MediaClass extends React.ClassicComponentClass<MediaProps> {
-        Left: typeof MediaLeft;
-        Right: typeof MediaRight;
-        Heading: typeof MediaHeading;
-        Body: typeof MediaBody;
-        List: typeof MediaList;
-        ListItem: typeof MediaListItem;
-    }
-    type Media = React.ClassicComponent<MediaProps>;
-    var Media: MediaClass;
-
-    /* Utils */
-    interface bootstrapUtilsType{
-        // TODO: Implement functions
-    }
-    function createChainedFunctionType(...funcs:Function[]):Function
-    interface ValidComponentChildrenType{
-        map: (children:any,func:any,context:any) => any
-        forEach:(children:any,func:any,context:any) => any
-        count:(children:any) => number
-        filter:(children:any,func:any,context:any) => any
-        find:(children:any,func:any,context:any) => any
-        every:(children:any,func:any,context:any) => any
-        some:(children:any,func:any,context:any) => any
-        toArray:(children:any) => any
-    }
-    class utils {
-        static bootstrapUtils:bootstrapUtilsType
-        static createChainedFunction: typeof createChainedFunctionType
-        static ValidComponentChildren:ValidComponentChildrenType
-    }
+export interface SelectCallback extends React.EventHandler<any> {
+  (eventKey: any, e: React.SyntheticEvent<{}>): void;
+  /**
+   * @deprecated
+   * This signature is a hack so can still derive from HTMLProps.
+   * It does not reflect the underlying event and should not be used.
+   */
+  (e: React.MouseEvent<{}>): void;
 }
+
+export interface TransitionCallbacks {
+  onEnter?(node: HTMLElement): any;
+  onEntered?(node: HTMLElement): any;
+  onEntering?(node: HTMLElement): any;
+  onExit?(node: HTMLElement): any;
+  onExited?(node: HTMLElement): any;
+  onExiting?(node: HTMLElement): any;
+}
+
+export {
+  Accordion,
+  Alert,
+  Badge,
+  Breadcrumb,
+  BreadcrumbItem,
+  Button,
+  ButtonGroup,
+  ButtonToolbar,
+  Carousel,
+  CarouselCaption,
+  CarouselItem,
+  Checkbox,
+  Clearfix,
+  Col,
+  Collapse,
+  ControlLabel,
+  Dropdown,
+  DropdownButton,
+  DropdownMenu,
+  DropdownToggle,
+  Fade,
+  Form,
+  FormControl,
+  FormControlFeedback,
+  FormControlStatic,
+  FormGroup,
+  Glyphicon,
+  Grid,
+  HelpBlock,
+  Image,
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  Jumbotron,
+  Label,
+  ListGroup,
+  ListGroupItem,
+  Media,
+  MediaBody,
+  MediaHeading,
+  MediaLeft,
+  MediaList,
+  MediaListItem,
+  MediaRight,
+  MenuItem,
+  Modal,
+  ModalBody,
+  ModalDialog,
+  ModalFooter,
+  ModalHeader,
+  ModalTitle,
+  Nav,
+  Navbar,
+  NavbarBrand,
+  NavbarCollapse,
+  NavbarHeader,
+  NavbarToggle,
+  NavDropdown,
+  NavItem,
+  Overlay,
+  OverlayTrigger,
+  PageHeader,
+  PageItem,
+  Pager,
+  PagerItem,
+  Pagination,
+  PaginationButton,
+  Panel,
+  PanelGroup,
+  Popover,
+  ProgressBar,
+  Radio,
+  ResponsiveEmbed,
+  Row,
+  SafeAnchor,
+  SplitButton,
+  SplitToggle,
+  Tab,
+  TabContainer,
+  TabContent,
+  Table,
+  TabPane,
+  Tabs,
+  Thumbnail,
+  Tooltip,
+  Well,
+  utils,
+} from './lib';
diff --git a/types/react-bootstrap/lib/Accordion.d.ts b/types/react-bootstrap/lib/Accordion.d.ts
new file mode 100644
index 0000000000..a438514645
--- /dev/null
+++ b/types/react-bootstrap/lib/Accordion.d.ts
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Accordion extends React.Component<AccordionProps> { }
+declare namespace Accordion { }
+export = Accordion;
+
+interface AccordionProps extends React.HTMLProps<Accordion> {
+  bsSize?: Sizes;
+  bsStyle?: string;
+  collapsible?: boolean;
+  defaultExpanded?: boolean;
+  eventKey?: any;
+  expanded?: boolean;
+  footer?: any; // TODO: Add more specific type
+  header?: any; // TODO: Add more specific type
+}
diff --git a/types/react-bootstrap/lib/Alert.d.ts b/types/react-bootstrap/lib/Alert.d.ts
new file mode 100644
index 0000000000..538984daa5
--- /dev/null
+++ b/types/react-bootstrap/lib/Alert.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Alert extends React.Component<AlertProps> { }
+declare namespace Alert { }
+export = Alert
+
+interface AlertProps extends React.HTMLProps<Alert> {
+  bsSize?: Sizes;
+  bsStyle?: string;
+  closeLabel?: string;
+  /** @deprecated since v0.29.0 */ dismissAfter?: number;
+  onDismiss?: Function;
+}
diff --git a/types/react-bootstrap/lib/Badge.d.ts b/types/react-bootstrap/lib/Badge.d.ts
new file mode 100644
index 0000000000..174cebacbd
--- /dev/null
+++ b/types/react-bootstrap/lib/Badge.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class Badge extends React.Component<BadgeProps> { }
+declare namespace Badge { }
+export = Badge
+
+interface BadgeProps extends React.HTMLProps<Badge> {
+  bsClass?: string;
+  pullRight?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Breadcrumb.d.ts b/types/react-bootstrap/lib/Breadcrumb.d.ts
new file mode 100644
index 0000000000..2f5d895172
--- /dev/null
+++ b/types/react-bootstrap/lib/Breadcrumb.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+import * as BreadcrumbItem from './BreadcrumbItem';
+
+declare class Breadcrumb extends React.Component<BreadcrumbProps> {
+  public static Item: typeof BreadcrumbItem;
+}
+declare namespace Breadcrumb { }
+export = Breadcrumb
+
+interface BreadcrumbProps extends React.HTMLProps<Breadcrumb> {
+  bsClass?: string;
+}
diff --git a/types/react-bootstrap/lib/BreadcrumbItem.d.ts b/types/react-bootstrap/lib/BreadcrumbItem.d.ts
new file mode 100644
index 0000000000..2e64aac615
--- /dev/null
+++ b/types/react-bootstrap/lib/BreadcrumbItem.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+declare class BreadcrumbItem extends React.Component<BreadcrumbItemProps> { }
+declare namespace BreadcrumbItem { }
+export = BreadcrumbItem
+
+interface BreadcrumbItemProps extends React.Props<BreadcrumbItem> {
+  active?: boolean;
+  href?: string;
+  title?: React.ReactNode;
+  target?: string;
+}
diff --git a/types/react-bootstrap/lib/Button.d.ts b/types/react-bootstrap/lib/Button.d.ts
new file mode 100644
index 0000000000..1c5504dbe6
--- /dev/null
+++ b/types/react-bootstrap/lib/Button.d.ts
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Button extends React.Component<ButtonProps> { }
+declare namespace Button { }
+export = Button
+
+interface ButtonProps extends React.HTMLProps<Button> {
+  bsClass?: string;
+  active?: boolean;
+  block?: boolean;
+  bsStyle?: string;
+  bsSize?: Sizes;
+  componentClass?: React.ReactType;
+  disabled?: boolean;
+}
diff --git a/types/react-bootstrap/lib/ButtonGroup.d.ts b/types/react-bootstrap/lib/ButtonGroup.d.ts
new file mode 100644
index 0000000000..4e4f4c2a35
--- /dev/null
+++ b/types/react-bootstrap/lib/ButtonGroup.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class ButtonGroup extends React.Component<ButtonGroupProps> { }
+declare namespace ButtonGroup { }
+export = ButtonGroup
+
+interface ButtonGroupProps extends React.HTMLProps<ButtonGroup> {
+  block?: boolean;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  justified?: boolean;
+  vertical?: boolean;
+}
diff --git a/types/react-bootstrap/lib/ButtonToolbar.d.ts b/types/react-bootstrap/lib/ButtonToolbar.d.ts
new file mode 100644
index 0000000000..06ee20b7c8
--- /dev/null
+++ b/types/react-bootstrap/lib/ButtonToolbar.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class ButtonToolbar extends React.Component<ButtonToolbarProps> { }
+declare namespace ButtonToolbar { }
+export = ButtonToolbar
+
+interface ButtonToolbarProps extends React.HTMLProps<ButtonToolbar> {
+  block?: boolean;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  justified?: boolean;
+  vertical?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Carousel.d.ts b/types/react-bootstrap/lib/Carousel.d.ts
new file mode 100644
index 0000000000..f035154d44
--- /dev/null
+++ b/types/react-bootstrap/lib/Carousel.d.ts
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { Sizes, SelectCallback } from 'react-bootstrap';
+import * as CarouselItem from './CarouselItem';
+import * as CarouselCaption from './CarouselCaption';
+
+declare class Carousel extends React.Component<CarouselProps> {
+  public static Caption: typeof CarouselCaption;
+  public static Item: typeof CarouselItem;
+}
+declare namespace Carousel { }
+export = Carousel
+
+interface CarouselProps extends React.HTMLProps<Carousel> {
+  activeIndex?: number;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  controls?: boolean;
+  defaultActiveIndex?: number;
+  direction?: string;
+  indicators?: boolean;
+  interval?: number;
+  nextIcon?: React.ReactNode;
+  onSelect?: SelectCallback;
+  onSlideEnd?: Function;
+  pauseOnHover?: boolean;
+  prevIcon?: React.ReactNode;
+  slide?: boolean;
+
+  // TODO: this is incompatible with HTMLProps.wrap, which is a string
+  // wrap?: boolean;
+}
diff --git a/types/react-bootstrap/lib/CarouselCaption.d.ts b/types/react-bootstrap/lib/CarouselCaption.d.ts
new file mode 100644
index 0000000000..3c2aeabff2
--- /dev/null
+++ b/types/react-bootstrap/lib/CarouselCaption.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class CarouselCaption extends React.Component<CarouselCaptionProps> { }
+declare namespace CarouselCaption { }
+export = CarouselCaption
+
+interface CarouselCaptionProps extends React.HTMLProps<CarouselCaption> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/CarouselItem.d.ts b/types/react-bootstrap/lib/CarouselItem.d.ts
new file mode 100644
index 0000000000..9bd9ba592e
--- /dev/null
+++ b/types/react-bootstrap/lib/CarouselItem.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+
+declare class CarouselItem extends React.Component<CarouselItemProps> { }
+declare namespace CarouselItem { }
+export = CarouselItem
+
+interface CarouselItemProps extends React.HTMLProps<CarouselItem> {
+  active?: boolean;
+  animtateIn?: boolean;
+  animateOut?: boolean;
+  direction?: string;
+  index?: number;
+  onAnimateOutEnd?: Function;
+}
diff --git a/types/react-bootstrap/lib/Checkbox.d.ts b/types/react-bootstrap/lib/Checkbox.d.ts
new file mode 100644
index 0000000000..ddff323b86
--- /dev/null
+++ b/types/react-bootstrap/lib/Checkbox.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+declare class Checkbox extends React.Component<CheckboxProps> { }
+declare namespace Checkbox { }
+export = Checkbox
+
+interface CheckboxProps extends React.HTMLProps<Checkbox> {
+  bsClass?: string;
+  disabled?: boolean;
+  inline?: boolean;
+  inputRef?: (instance: HTMLInputElement) => void;
+  validationState?: "success" | "warning" | "error";
+}
diff --git a/types/react-bootstrap/lib/Clearfix.d.ts b/types/react-bootstrap/lib/Clearfix.d.ts
new file mode 100644
index 0000000000..d473db79c3
--- /dev/null
+++ b/types/react-bootstrap/lib/Clearfix.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+declare class Clearfix extends React.Component<ClearfixProps> { }
+declare namespace Clearfix { }
+export = Clearfix
+
+interface ClearfixProps extends React.HTMLProps<Clearfix> {
+  componentClass?: React.ReactType,
+  visibleXsBlock?: boolean;
+  visibleSmBlock?: boolean;
+  visibleMdBlock?: boolean;
+  visibleLgBlock?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Col.d.ts b/types/react-bootstrap/lib/Col.d.ts
new file mode 100644
index 0000000000..cf21203e99
--- /dev/null
+++ b/types/react-bootstrap/lib/Col.d.ts
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+declare class Col extends React.Component<ColProps> { }
+declare namespace Col { }
+export = Col
+
+interface ColProps extends React.HTMLProps<Col> {
+  componentClass?: React.ReactType;
+  lg?: number;
+  lgHidden?: boolean;
+  lgOffset?: number;
+  lgPull?: number;
+  lgPush?: number;
+  md?: number;
+  mdHidden?: boolean;
+  mdOffset?: number;
+  mdPull?: number;
+  mdPush?: number;
+  sm?: number;
+  smHidden?: boolean;
+  smOffset?: number;
+  smPull?: number;
+  smPush?: number;
+  xs?: number;
+  xsHidden?: boolean;
+  xsOffset?: number;
+  xsPull?: number;
+  xsPush?: number;
+}
diff --git a/types/react-bootstrap/lib/Collapse.d.ts b/types/react-bootstrap/lib/Collapse.d.ts
new file mode 100644
index 0000000000..97e5d1b786
--- /dev/null
+++ b/types/react-bootstrap/lib/Collapse.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { TransitionCallbacks } from 'react-bootstrap';
+
+declare class Collapse extends React.Component<CollapseProps> { }
+declare namespace Collapse { }
+export = Collapse
+
+interface CollapseProps extends TransitionCallbacks, React.Props<Collapse> {
+  dimension?: 'height' | 'width' | { ( ):string };
+  getDimensionValue?: ( dimension:number, element:React.ReactElement<any> ) => number;
+  in?: boolean;
+  timeout?: number;
+  transitionAppear?: boolean;
+  unmountOnExit?: boolean;
+}
diff --git a/types/react-bootstrap/lib/ControlLabel.d.ts b/types/react-bootstrap/lib/ControlLabel.d.ts
new file mode 100644
index 0000000000..0afedce594
--- /dev/null
+++ b/types/react-bootstrap/lib/ControlLabel.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+declare class ControlLabel extends React.Component<ControlLabelProps> { }
+declare namespace ControlLabel { }
+export = ControlLabel
+
+interface ControlLabelProps extends React.HTMLProps<ControlLabel> {
+  bsClass?: string;
+  htmlFor?: string;
+  srOnly?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Dropdown.d.ts b/types/react-bootstrap/lib/Dropdown.d.ts
new file mode 100644
index 0000000000..74893be195
--- /dev/null
+++ b/types/react-bootstrap/lib/Dropdown.d.ts
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+import * as DropdownToggle from './DropdownToggle';
+import * as DropdownMenu from './DropdownMenu';
+
+declare class Dropdown extends React.Component<DropdownProps> {
+  public static Menu: typeof DropdownMenu;
+  public static Toggle: typeof DropdownToggle;
+}
+export = Dropdown
+
+type DropdownProps = Dropdown.DropdownBaseProps & React.HTMLProps<Dropdown>;
+
+declare namespace Dropdown {
+  interface DropdownBaseProps {
+    bsClass?: string;
+    componentClass?: React.ReactType;
+    disabled?: boolean;
+    dropup?: boolean;
+    id: string;
+    onClose?: Function;
+    onSelect?: SelectCallback;
+    onToggle?: (isOpen: boolean) => void;
+    open?: boolean;
+    pullRight?: boolean;
+    role?: string;
+  }
+}
diff --git a/types/react-bootstrap/lib/DropdownButton.d.ts b/types/react-bootstrap/lib/DropdownButton.d.ts
new file mode 100644
index 0000000000..b9bcc3b0d8
--- /dev/null
+++ b/types/react-bootstrap/lib/DropdownButton.d.ts
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+import { DropdownBaseProps } from './Dropdown';
+
+declare class DropdownButton extends React.Component<DropdownButtonProps> { }
+declare namespace DropdownButton { }
+export = DropdownButton
+
+interface DropdownButtonBaseProps extends DropdownBaseProps {
+  block?: boolean;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  navItem?: boolean;
+  noCaret?: boolean;
+  pullRight?: boolean;
+}
+
+type DropdownButtonProps = DropdownButtonBaseProps & React.HTMLProps<DropdownButton>;
diff --git a/types/react-bootstrap/lib/DropdownMenu.d.ts b/types/react-bootstrap/lib/DropdownMenu.d.ts
new file mode 100644
index 0000000000..5c7a7f2c7d
--- /dev/null
+++ b/types/react-bootstrap/lib/DropdownMenu.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+
+declare class DropdownMenu extends React.Component<DropdownMenuProps> { }
+declare namespace DropdownMenu { }
+export = DropdownMenu
+
+interface DropdownMenuProps extends React.HTMLProps<DropdownMenu> {
+  labelledBy?: string | number;
+  onClose?: Function;
+  onSelect?: SelectCallback;
+  open?: boolean;
+  pullRight?: boolean;
+}
diff --git a/types/react-bootstrap/lib/DropdownToggle.d.ts b/types/react-bootstrap/lib/DropdownToggle.d.ts
new file mode 100644
index 0000000000..44c4e07463
--- /dev/null
+++ b/types/react-bootstrap/lib/DropdownToggle.d.ts
@@ -0,0 +1,16 @@
+import * as React from 'react';
+
+declare class DropdownToggle extends React.Component<DropdownToggle.DropdownToggleProps> { }
+export = DropdownToggle
+
+declare namespace DropdownToggle {
+  interface DropdownToggleProps extends React.HTMLProps<DropdownToggle> {
+    bsRole?: string;
+    noCaret?: boolean;
+    open?: boolean;
+    title?: string;
+    useAnchor?: boolean;
+    bsClass?:string; // Added since v0.30.0
+    bsStyle?:string;
+  }
+}
diff --git a/types/react-bootstrap/lib/Fade.d.ts b/types/react-bootstrap/lib/Fade.d.ts
new file mode 100644
index 0000000000..08f40c1789
--- /dev/null
+++ b/types/react-bootstrap/lib/Fade.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import { TransitionCallbacks } from 'react-bootstrap';
+
+declare class Fade extends React.Component<FadeProps> { }
+declare namespace Fade { }
+export = Fade
+
+interface FadeProps extends TransitionCallbacks, React.HTMLProps<Fade> {
+  in?: boolean;
+  timeout?: number;
+  transitionAppear?: boolean;
+  unmountOnExit?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Form.d.ts b/types/react-bootstrap/lib/Form.d.ts
new file mode 100644
index 0000000000..17de7f6571
--- /dev/null
+++ b/types/react-bootstrap/lib/Form.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+declare class Form extends React.Component<FormProps> { }
+declare namespace Form { }
+export = Form
+
+interface FormProps extends React.HTMLProps<Form> {
+  bsClass?: string;
+  componentClass?: React.ReactType;
+  horizontal?: boolean;
+  inline?: boolean;
+}
diff --git a/types/react-bootstrap/lib/FormControl.d.ts b/types/react-bootstrap/lib/FormControl.d.ts
new file mode 100644
index 0000000000..e89450856a
--- /dev/null
+++ b/types/react-bootstrap/lib/FormControl.d.ts
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+import * as FormControlFeedback from './FormControlFeedback';
+import * as FormControlStatic from './FormControlStatic';
+
+declare class FormControl extends React.Component<FormControlProps> {
+  public static Feedback: typeof FormControlFeedback;
+  public static Static: typeof FormControlStatic;
+}
+declare namespace FormControl { }
+export = FormControl
+
+interface FormControlProps extends React.HTMLProps<FormControl> {
+  bsClass?: string;
+  bsSize?: Sizes;
+  componentClass?: React.ReactType;
+  id?: string;
+  inputRef?: (instance: HTMLInputElement) => void;
+  type?: string;
+}
diff --git a/types/react-bootstrap/lib/FormControlFeedback.d.ts b/types/react-bootstrap/lib/FormControlFeedback.d.ts
new file mode 100644
index 0000000000..f48ebf5ede
--- /dev/null
+++ b/types/react-bootstrap/lib/FormControlFeedback.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+declare class FormControlFeedback extends React.Component<FormControlFeedbackProps> { }
+declare namespace FormControlFeedback { }
+export = FormControlFeedback
+
+interface FormControlFeedbackProps extends React.HTMLProps<FormControlFeedback> { }
diff --git a/types/react-bootstrap/lib/FormControlStatic.d.ts b/types/react-bootstrap/lib/FormControlStatic.d.ts
new file mode 100644
index 0000000000..177a9d5920
--- /dev/null
+++ b/types/react-bootstrap/lib/FormControlStatic.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class FormControlStatic extends React.Component<FormControlStaticProps> { }
+declare namespace FormControlStatic { }
+export = FormControlStatic
+
+interface FormControlStaticProps extends React.HTMLProps<FormControlStatic> {
+  bsClass?: string;
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/FormGroup.d.ts b/types/react-bootstrap/lib/FormGroup.d.ts
new file mode 100644
index 0000000000..f1d413f66e
--- /dev/null
+++ b/types/react-bootstrap/lib/FormGroup.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class FormGroup extends React.Component<FormGroupProps> { }
+declare namespace FormGroup { }
+export = FormGroup
+
+interface FormGroupProps extends React.HTMLProps<FormGroup> {
+  bsClass?: string;
+  bsSize?: Sizes;
+  controlId?: string;
+  validationState?: "success" | "warning" | "error";
+}
diff --git a/types/react-bootstrap/lib/Glyphicon.d.ts b/types/react-bootstrap/lib/Glyphicon.d.ts
new file mode 100644
index 0000000000..5e17376645
--- /dev/null
+++ b/types/react-bootstrap/lib/Glyphicon.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class Glyphicon extends React.Component<GlyphiconProps> { }
+declare namespace Glyphicon { }
+export = Glyphicon
+
+interface GlyphiconProps extends React.HTMLProps<Glyphicon> {
+  // Required
+  glyph: string;
+}
diff --git a/types/react-bootstrap/lib/Grid.d.ts b/types/react-bootstrap/lib/Grid.d.ts
new file mode 100644
index 0000000000..4405a8c80c
--- /dev/null
+++ b/types/react-bootstrap/lib/Grid.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+declare class Grid extends React.Component<GridProps> { }
+declare namespace Grid { }
+export = Grid
+
+interface GridProps extends React.HTMLProps<Grid> {
+  componentClass?: React.ReactType;
+  fluid?: boolean;
+  bsClass?: string;
+}
diff --git a/types/react-bootstrap/lib/HelpBlock.d.ts b/types/react-bootstrap/lib/HelpBlock.d.ts
new file mode 100644
index 0000000000..ecd3c5848a
--- /dev/null
+++ b/types/react-bootstrap/lib/HelpBlock.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class HelpBlock extends React.Component<HelpBlockProps> { }
+declare namespace HelpBlock { }
+export = HelpBlock
+
+interface HelpBlockProps extends React.HTMLProps<HelpBlock> {
+  bsClass?: string;
+}
diff --git a/types/react-bootstrap/lib/Image.d.ts b/types/react-bootstrap/lib/Image.d.ts
new file mode 100644
index 0000000000..94477384a4
--- /dev/null
+++ b/types/react-bootstrap/lib/Image.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+declare class Image extends React.Component<ImageProps> { }
+declare namespace Image { }
+export = Image
+
+interface ImageProps extends React.HTMLProps<Image> {
+  circle?: boolean;
+  responsive?: boolean;
+  rounded?: boolean;
+  thumbnail?: boolean;
+}
diff --git a/types/react-bootstrap/lib/InputGroup.d.ts b/types/react-bootstrap/lib/InputGroup.d.ts
new file mode 100644
index 0000000000..cd1e45579f
--- /dev/null
+++ b/types/react-bootstrap/lib/InputGroup.d.ts
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+import * as InputGroupAddon from './InputGroupAddon';
+import * as InputGroupButton from './InputGroupButton';
+
+declare class InputGroup extends React.Component<InputGroupProps> {
+  public static Addon: typeof InputGroupAddon;
+  public static Button: typeof InputGroupButton;
+}
+declare namespace InputGroup { }
+export = InputGroup
+
+interface InputGroupProps extends React.HTMLProps<InputGroup> {
+  bsClass?: string;
+  bsSize?: Sizes;
+}
diff --git a/types/react-bootstrap/lib/InputGroupAddon.d.ts b/types/react-bootstrap/lib/InputGroupAddon.d.ts
new file mode 100644
index 0000000000..e462baeeab
--- /dev/null
+++ b/types/react-bootstrap/lib/InputGroupAddon.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+declare class InputGroupAddon extends React.Component<InputGroupAddonProps> { }
+declare namespace InputGroupAddon { }
+export = InputGroupAddon
+
+interface InputGroupAddonProps extends React.HTMLProps<InputGroupAddon> { }
diff --git a/types/react-bootstrap/lib/InputGroupButton.d.ts b/types/react-bootstrap/lib/InputGroupButton.d.ts
new file mode 100644
index 0000000000..e5db2f7ca4
--- /dev/null
+++ b/types/react-bootstrap/lib/InputGroupButton.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+declare class InputGroupButton extends React.Component<InputGroupButtonProps> { }
+declare namespace InputGroupButton { }
+export = InputGroupButton
+
+interface InputGroupButtonProps extends React.HTMLProps<InputGroupButton> { }
diff --git a/types/react-bootstrap/lib/Jumbotron.d.ts b/types/react-bootstrap/lib/Jumbotron.d.ts
new file mode 100644
index 0000000000..2e3fcae76f
--- /dev/null
+++ b/types/react-bootstrap/lib/Jumbotron.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class Jumbotron extends React.Component<JumbotronProps> { }
+declare namespace Jumbotron { }
+export = Jumbotron
+
+interface JumbotronProps extends React.HTMLProps<Jumbotron> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/Label.d.ts b/types/react-bootstrap/lib/Label.d.ts
new file mode 100644
index 0000000000..8586ba4107
--- /dev/null
+++ b/types/react-bootstrap/lib/Label.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Label extends React.Component<LabelProps> { }
+declare namespace Label { }
+export = Label
+
+interface LabelProps extends React.HTMLProps<Label> {
+  bsSize?: Sizes;
+  bsStyle?: string;
+}
diff --git a/types/react-bootstrap/lib/ListGroup.d.ts b/types/react-bootstrap/lib/ListGroup.d.ts
new file mode 100644
index 0000000000..c3df4d761f
--- /dev/null
+++ b/types/react-bootstrap/lib/ListGroup.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class ListGroup extends React.Component<ListGroupProps> { }
+declare namespace ListGroup { }
+export = ListGroup
+
+interface ListGroupProps extends React.HTMLProps<ListGroup> {
+  componentClass?: React.ReactType; // Added since v0.30.0
+  fill?: boolean; // TODO: Add more specific type
+}
diff --git a/types/react-bootstrap/lib/ListGroupItem.d.ts b/types/react-bootstrap/lib/ListGroupItem.d.ts
new file mode 100644
index 0000000000..b56d4078e0
--- /dev/null
+++ b/types/react-bootstrap/lib/ListGroupItem.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class ListGroupItem extends React.Component<ListGroupItemProps> { }
+declare namespace ListGroupItem { }
+export = ListGroupItem
+
+interface ListGroupItemProps extends React.HTMLProps<ListGroupItem> {
+  active?: any;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  eventKey?: any;
+  header?: any; // TODO: Add more specific type
+  listItem?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Media.d.ts b/types/react-bootstrap/lib/Media.d.ts
new file mode 100644
index 0000000000..138f954c27
--- /dev/null
+++ b/types/react-bootstrap/lib/Media.d.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import * as MediaBody from './MediaBody';
+import * as MediaHeading from './MediaHeading';
+import * as MediaLeft from './MediaLeft';
+import * as MediaList from './MediaList';
+import * as MediaListItem from './MediaListItem';
+import * as MediaRight from './MediaRight';
+
+declare class Media extends React.Component<MediaProps> {
+  public static Body: typeof MediaBody;
+  public static Heading: typeof MediaHeading;
+  public static Left: typeof MediaLeft;
+  public static Right: typeof MediaRight;
+  public static List: typeof MediaList;
+  public static ListItem: typeof MediaListItem;
+}
+declare namespace Media { }
+export = Media
+
+interface MediaProps extends React.HTMLProps<Media> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/MediaBody.d.ts b/types/react-bootstrap/lib/MediaBody.d.ts
new file mode 100644
index 0000000000..3f65c5d9fc
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaBody.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class MediaBody extends React.Component<MediaBodyProps> { }
+declare namespace MediaBody { }
+export = MediaBody
+
+interface MediaBodyProps extends React.Props<MediaBody> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/MediaHeading.d.ts b/types/react-bootstrap/lib/MediaHeading.d.ts
new file mode 100644
index 0000000000..81f564742e
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaHeading.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class MediaHeading extends React.Component<MediaHeadingProps> { }
+declare namespace MediaHeading { }
+export = MediaHeading
+
+interface MediaHeadingProps extends React.HTMLProps<MediaHeading> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/MediaLeft.d.ts b/types/react-bootstrap/lib/MediaLeft.d.ts
new file mode 100644
index 0000000000..86dbc37afe
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaLeft.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class MediaLeft extends React.Component<MediaLeftProps> { }
+declare namespace MediaLeft { }
+export = MediaLeft
+
+interface MediaLeftProps extends React.HTMLProps<MediaLeft> {
+  align?: string;
+}
diff --git a/types/react-bootstrap/lib/MediaList.d.ts b/types/react-bootstrap/lib/MediaList.d.ts
new file mode 100644
index 0000000000..d30172904d
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaList.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+declare class MediaList extends React.Component<MediaListProps> { }
+declare namespace MediaList { }
+export = MediaList
+
+interface MediaListProps extends React.HTMLProps<MediaList> { }
diff --git a/types/react-bootstrap/lib/MediaListItem.d.ts b/types/react-bootstrap/lib/MediaListItem.d.ts
new file mode 100644
index 0000000000..21dfe654e7
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaListItem.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class MediaListItem extends React.Component<MediaListItemProps> { }
+declare namespace MediaListItem { }
+export = MediaListItem
+
+interface MediaListItemProps extends React.HTMLProps<MediaListItem> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/MediaRight.d.ts b/types/react-bootstrap/lib/MediaRight.d.ts
new file mode 100644
index 0000000000..b9eb34e684
--- /dev/null
+++ b/types/react-bootstrap/lib/MediaRight.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class MediaRight extends React.Component<MediaRightProps> { }
+declare namespace MediaRight { }
+export = MediaRight
+
+interface MediaRightProps extends React.HTMLProps<MediaRight> {
+  align?: string;
+}
diff --git a/types/react-bootstrap/lib/MenuItem.d.ts b/types/react-bootstrap/lib/MenuItem.d.ts
new file mode 100644
index 0000000000..aed4dd38ac
--- /dev/null
+++ b/types/react-bootstrap/lib/MenuItem.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+
+declare class MenuItem extends React.Component<MenuItemProps> { }
+declare namespace MenuItem { }
+export = MenuItem
+
+interface MenuItemProps extends React.HTMLProps<MenuItem> {
+  active?: boolean;
+  bsClass?: string;
+  disabled?: boolean;
+  divider?: boolean;
+  eventKey?: any;
+  header?: boolean;
+  onClick?: React.MouseEventHandler<{}>;
+  onSelect?: SelectCallback;
+  target?: string;
+  title?: string;
+}
diff --git a/types/react-bootstrap/lib/Modal.d.ts b/types/react-bootstrap/lib/Modal.d.ts
new file mode 100644
index 0000000000..dad44cbf3f
--- /dev/null
+++ b/types/react-bootstrap/lib/Modal.d.ts
@@ -0,0 +1,43 @@
+import * as React from 'react';
+import { Sizes, TransitionCallbacks } from 'react-bootstrap';
+import * as ModalBody from './ModalBody';
+import * as ModalHeader from './ModalHeader';
+import * as ModalTitle from './ModalTitle';
+import * as ModalDialog from './ModalDialog';
+import * as ModalFooter from './ModalFooter';
+
+declare class Modal extends React.Component<ModalProps> {
+  public static Body: typeof ModalBody;
+  public static Header: typeof ModalHeader;
+  public static Title: typeof ModalTitle;
+  public static Footer: typeof ModalFooter;
+  public static Dialog: typeof ModalDialog;
+}
+declare namespace Modal { }
+export = Modal
+
+interface ModalProps extends TransitionCallbacks, React.HTMLProps<Modal> {
+  // Required
+  onHide: Function;
+
+  // Optional
+  animation?: boolean;
+  autoFocus?: boolean;
+  backdrop?: boolean | string;
+  backdropClassName?: string;
+  backdropStyle?: any;
+  backdropTransitionTimeout?: number;
+  bsSize?: Sizes;
+  container?: any; // TODO: Add more specific type
+  containerClassName?: string;
+  dialogClassName?: string;
+  dialogComponent?: any; // TODO: Add more specific type
+  dialogTransitionTimeout?: number;
+  enforceFocus?: boolean;
+  keyboard?: boolean;
+  onBackdropClick?: (node: HTMLElement) => any;
+  onEscapeKeyUp?: (node: HTMLElement) => any;
+  onShow?: (node: HTMLElement) => any;
+  show?: boolean;
+  transition?: React.ReactElement<any>;
+}
diff --git a/types/react-bootstrap/lib/ModalBody.d.ts b/types/react-bootstrap/lib/ModalBody.d.ts
new file mode 100644
index 0000000000..9eab8be741
--- /dev/null
+++ b/types/react-bootstrap/lib/ModalBody.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class ModalBody extends React.Component<ModalBodyProps> { }
+declare namespace ModalBody { }
+export = ModalBody
+
+interface ModalBodyProps extends React.HTMLProps<ModalBody> {
+  // TODO: these props are not correct https://github.com/react-bootstrap/react-bootstrap/blob/v0.31.1/src/ModalBody.js
+  modalClassName?: string;
+}
diff --git a/types/react-bootstrap/lib/ModalDialog.d.ts b/types/react-bootstrap/lib/ModalDialog.d.ts
new file mode 100644
index 0000000000..2b307e18f6
--- /dev/null
+++ b/types/react-bootstrap/lib/ModalDialog.d.ts
@@ -0,0 +1,16 @@
+import * as React from 'react';
+
+declare class ModalDialog extends React.Component<ModalDialogProps> { }
+declare namespace ModalDialog { }
+export = ModalDialog
+
+interface ModalDialogProps extends React.HTMLProps<ModalDialog> {
+  // TODO: these props are not correct https://github.com/react-bootstrap/react-bootstrap/blob/v0.31.1/src/ModalDialog.js#L9
+  onHide?: Function;
+  onEnter?: Function;
+  onEntered?: Function;
+  onEntering?: Function;
+  onExit?: Function;
+  onExited?: Function;
+  onExiting?: Function;
+}
diff --git a/types/react-bootstrap/lib/ModalFooter.d.ts b/types/react-bootstrap/lib/ModalFooter.d.ts
new file mode 100644
index 0000000000..34fa6afb4a
--- /dev/null
+++ b/types/react-bootstrap/lib/ModalFooter.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class ModalFooter extends React.Component<ModalFooterProps> { }
+declare namespace ModalFooter { }
+export = ModalFooter
+
+interface ModalFooterProps extends React.HTMLProps<ModalFooter> {
+  // TODO: these props are not correct https://github.com/react-bootstrap/react-bootstrap/blob/v0.31.1/src/ModalFooter.js
+  modalClassName?: string;
+}
diff --git a/types/react-bootstrap/lib/ModalHeader.d.ts b/types/react-bootstrap/lib/ModalHeader.d.ts
new file mode 100644
index 0000000000..0b1b52326e
--- /dev/null
+++ b/types/react-bootstrap/lib/ModalHeader.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+declare class ModalHeader extends React.Component<ModalHeaderProps> { }
+declare namespace ModalHeader { }
+export = ModalHeader
+
+interface ModalHeaderProps extends React.HTMLProps<ModalHeader> {
+  // TODO: these props are not correct https://github.com/react-bootstrap/react-bootstrap/blob/v0.31.1/src/ModalHeader.js
+  closeButton?: boolean;
+  modalClassName?: string;
+  onHide?: Function;
+}
diff --git a/types/react-bootstrap/lib/ModalTitle.d.ts b/types/react-bootstrap/lib/ModalTitle.d.ts
new file mode 100644
index 0000000000..56ffd85dd8
--- /dev/null
+++ b/types/react-bootstrap/lib/ModalTitle.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+
+declare class ModalTitle extends React.Component<ModalTitleProps> { }
+declare namespace ModalTitle { }
+export = ModalTitle
+
+interface ModalTitleProps extends React.HTMLProps<ModalTitle> {
+  // TODO: props are not correct https://github.com/react-bootstrap/react-bootstrap/blob/v0.31.1/src/ModalTitle.js
+  modalClassName?: string;
+}
diff --git a/types/react-bootstrap/lib/Nav.d.ts b/types/react-bootstrap/lib/Nav.d.ts
new file mode 100644
index 0000000000..d0a9728de8
--- /dev/null
+++ b/types/react-bootstrap/lib/Nav.d.ts
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Nav extends React.Component<NavProps> { }
+declare namespace Nav { }
+export = Nav
+
+// TODO: This one turned into a union of two different types
+interface NavProps extends React.HTMLProps<Nav> {
+  // Optional
+  activeHref?: string;
+  activeKey?: any;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  collapsible?: boolean;
+  eventKey?: any;
+  expanded?: boolean;
+  justified?: boolean;
+  navbar?: boolean;
+  pullRight?: boolean;
+  right?: boolean;
+  stacked?: boolean;
+  ulClassName?: string;
+  ulId?: string;
+}
diff --git a/types/react-bootstrap/lib/NavDropdown.d.ts b/types/react-bootstrap/lib/NavDropdown.d.ts
new file mode 100644
index 0000000000..4dcd58f947
--- /dev/null
+++ b/types/react-bootstrap/lib/NavDropdown.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { DropdownBaseProps } from './Dropdown';
+
+declare class NavDropdown extends React.Component<NavDropdownProps> { }
+declare namespace NavDropdown { }
+export = NavDropdown
+
+interface NavDropdownBaseProps extends DropdownBaseProps {
+  active?: boolean;
+  noCaret?: boolean;
+  eventKey?: any;
+}
+
+type NavDropdownProps = NavDropdownBaseProps & React.HTMLProps<NavDropdown>;
diff --git a/types/react-bootstrap/lib/NavItem.d.ts b/types/react-bootstrap/lib/NavItem.d.ts
new file mode 100644
index 0000000000..92ec0aee0d
--- /dev/null
+++ b/types/react-bootstrap/lib/NavItem.d.ts
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { Sizes, SelectCallback } from 'react-bootstrap';
+
+declare class NavItem extends React.Component<NavItemProps> { }
+declare namespace NavItem { }
+export = NavItem
+
+interface NavItemProps extends React.HTMLProps<NavItem> {
+  active?: boolean;
+  brand?: any; // TODO: Add more specific type
+  bsSize?: Sizes;
+  bsStyle?: string;
+  componentClass?: React.ReactType;
+  defaultNavExpanded?: boolean;
+  eventKey?: any;
+  fixedBottom?: boolean;
+  fixedTop?: boolean;
+  fluid?: boolean;
+  inverse?: boolean;
+  linkId?: string;
+  navExpanded?: boolean;
+  onSelect?: SelectCallback;
+  onToggle?: Function;
+  staticTop?: boolean;
+  toggleButton?: any; // TODO: Add more specific type
+  toggleNavKey?: string | number;
+}
diff --git a/types/react-bootstrap/lib/Navbar.d.ts b/types/react-bootstrap/lib/Navbar.d.ts
new file mode 100644
index 0000000000..50f55a641e
--- /dev/null
+++ b/types/react-bootstrap/lib/Navbar.d.ts
@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+import * as NavbarBrand from './NavbarBrand';
+import * as NavbarCollapse from './NavbarCollapse';
+import * as NavbarHeader from './NavbarHeader';
+import * as NavbarToggle from './NavbarToggle';
+
+declare class Navbar extends React.Component<NavbarProps> {
+  public static Brand: typeof NavbarBrand;
+  public static Collapse: typeof NavbarCollapse;
+  public static Header: typeof NavbarHeader;
+  public static Toggle: typeof NavbarToggle;
+  public static Link: typeof NavbarLink;
+  public static Text: typeof NavbarText;
+  public static Form: typeof NavbarForm;
+}
+declare namespace Navbar { }
+export = Navbar
+
+interface NavbarProps extends React.HTMLProps<Navbar> {
+  brand?: any; // TODO: Add more specific type
+  bsSize?: Sizes;
+  bsStyle?: string;
+  collapseOnSelect?: boolean;
+  componentClass?: React.ReactType;
+  defaultNavExpanded?: boolean;
+  fixedBottom?: boolean;
+  fixedTop?: boolean;
+  fluid?: boolean;
+  inverse?: boolean;
+  navExpanded?: boolean;
+  onToggle?: Function;
+  staticTop?: boolean;
+  toggleButton?: any; // TODO: Add more specific type
+  toggleNavKey?: string | number;
+}
+
+/**
+ * the classes below aren't present in lib/
+ */
+
+interface NavbarLinkProps extends React.Props<NavbarLink> {
+  href: string;
+  onClick?: React.MouseEventHandler<HTMLAnchorElement>;
+}
+declare class NavbarLink extends React.Component<NavbarLinkProps> { }
+
+interface NavbarTextProps extends React.HTMLProps<NavbarText> {
+  pullRight?: boolean;
+}
+declare class NavbarText extends React.Component<NavbarTextProps> { }
+
+interface NavbarFormProps extends React.HTMLProps<NavbarForm> {
+  componentClass?: React.ReactType;
+  pullRight?: boolean;
+}
+declare class NavbarForm extends React.Component<NavbarFormProps> { }
diff --git a/types/react-bootstrap/lib/NavbarBrand.d.ts b/types/react-bootstrap/lib/NavbarBrand.d.ts
new file mode 100644
index 0000000000..65dd53f1fb
--- /dev/null
+++ b/types/react-bootstrap/lib/NavbarBrand.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+
+declare class NavbarBrand extends React.Component<NavbarBrandProps> { }
+declare namespace NavbarBrand { }
+export = NavbarBrand
+
+interface NavbarBrandProps extends React.HTMLProps<NavbarBrand> { }
diff --git a/types/react-bootstrap/lib/NavbarCollapse.d.ts b/types/react-bootstrap/lib/NavbarCollapse.d.ts
new file mode 100644
index 0000000000..1712dd7312
--- /dev/null
+++ b/types/react-bootstrap/lib/NavbarCollapse.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+
+declare class NavbarCollapse extends React.Component<NavbarCollapseProps> { }
+declare namespace NavbarCollapse { }
+export = NavbarCollapse
+interface NavbarCollapseProps extends React.HTMLProps<NavbarCollapse> { }
diff --git a/types/react-bootstrap/lib/NavbarHeader.d.ts b/types/react-bootstrap/lib/NavbarHeader.d.ts
new file mode 100644
index 0000000000..9b20da118d
--- /dev/null
+++ b/types/react-bootstrap/lib/NavbarHeader.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+
+declare class NavbarHeader extends React.Component<NavbarHeaderProps> { }
+declare namespace NavbarHeader { }
+export = NavbarHeader
+interface NavbarHeaderProps extends React.HTMLProps<NavbarHeader> { }
diff --git a/types/react-bootstrap/lib/NavbarToggle.d.ts b/types/react-bootstrap/lib/NavbarToggle.d.ts
new file mode 100644
index 0000000000..c08f63574c
--- /dev/null
+++ b/types/react-bootstrap/lib/NavbarToggle.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class NavbarToggle extends React.Component<NavbarToggleProps> { }
+declare namespace NavbarToggle { }
+export = NavbarToggle
+
+interface NavbarToggleProps extends React.Props<NavbarToggle> {
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
+}
diff --git a/types/react-bootstrap/lib/Overlay.d.ts b/types/react-bootstrap/lib/Overlay.d.ts
new file mode 100644
index 0000000000..ed84ec6e63
--- /dev/null
+++ b/types/react-bootstrap/lib/Overlay.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { TransitionCallbacks } from 'react-bootstrap';
+
+declare class Overlay extends React.Component<OverlayProps> { }
+declare namespace Overlay { }
+export = Overlay
+
+interface OverlayProps extends TransitionCallbacks {
+  // Optional
+  animation?: any; // TODO: Add more specific type
+  container?: any; // TODO: Add more specific type
+  containerPadding?: number; // TODO: Add more specific type
+  onHide?: Function;
+  placement?: string;
+  rootClose?: boolean;
+  show?: boolean;
+  target?: Function | React.ReactInstance;
+  shouldUpdatePosition?: boolean;
+}
diff --git a/types/react-bootstrap/lib/OverlayTrigger.d.ts b/types/react-bootstrap/lib/OverlayTrigger.d.ts
new file mode 100644
index 0000000000..d8ea871e13
--- /dev/null
+++ b/types/react-bootstrap/lib/OverlayTrigger.d.ts
@@ -0,0 +1,28 @@
+import * as React from 'react';
+
+declare class OverlayTrigger extends React.Component<OverlayTriggerProps> { }
+declare namespace OverlayTrigger { }
+export = OverlayTrigger
+
+interface OverlayTriggerProps extends React.Props<OverlayTrigger> {
+  // Required
+  overlay: any; // TODO: Add more specific type
+
+  // Optional
+  animation?: any; // TODO: Add more specific type
+  container?: any; // TODO: Add more specific type
+  containerPadding?: number;
+  defaultOverlayShown?: boolean;
+  delay?: number;
+  delayHide?: number;
+  delayShow?: number;
+  onEnter?: Function;
+  onEntered?: Function;
+  onEntering?: Function;
+  onExit?: Function;
+  onExited?: Function;
+  onExiting?: Function;
+  placement?: string;
+  rootClose?: boolean;
+  trigger?: string | string[];
+}
diff --git a/types/react-bootstrap/lib/PageHeader.d.ts b/types/react-bootstrap/lib/PageHeader.d.ts
new file mode 100644
index 0000000000..33ad5fc403
--- /dev/null
+++ b/types/react-bootstrap/lib/PageHeader.d.ts
@@ -0,0 +1,6 @@
+import * as React from 'react';
+
+declare class PageHeader extends React.Component<PageHeaderProps> { }
+declare namespace PageHeader { }
+export = PageHeader
+interface PageHeaderProps extends React.HTMLProps<PageHeader> { }
diff --git a/types/react-bootstrap/lib/PageItem.d.ts b/types/react-bootstrap/lib/PageItem.d.ts
new file mode 100644
index 0000000000..ea83f0f97e
--- /dev/null
+++ b/types/react-bootstrap/lib/PageItem.d.ts
@@ -0,0 +1,3 @@
+/** @deprecated since v0.30.0, should use <Pager.Item> instead of <PageItem>*/
+import * as PagerItem from './PagerItem';
+export = PagerItem;
diff --git a/types/react-bootstrap/lib/Pager.d.ts b/types/react-bootstrap/lib/Pager.d.ts
new file mode 100644
index 0000000000..6615c79b75
--- /dev/null
+++ b/types/react-bootstrap/lib/Pager.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+import * as PagerItem from './PagerItem';
+
+declare class Pager extends React.Component<PagerProps> {
+  public static Item: typeof PagerItem;
+}
+declare namespace Pager { }
+export = Pager
+
+interface PagerProps extends React.HTMLProps<Pager> {
+  onSelect?: SelectCallback;
+}
diff --git a/types/react-bootstrap/lib/PagerItem.d.ts b/types/react-bootstrap/lib/PagerItem.d.ts
new file mode 100644
index 0000000000..9314545304
--- /dev/null
+++ b/types/react-bootstrap/lib/PagerItem.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+
+declare class PagerItem extends React.Component<PagerItemProps> { }
+declare namespace PagerItem { }
+export = PagerItem
+
+interface PagerItemProps extends React.HTMLProps<PagerItem> {
+  disabled?: boolean;
+  eventKey?: any;
+  next?: boolean;
+  onSelect?: SelectCallback;
+  previous?: boolean;
+  target?: string;
+}
diff --git a/types/react-bootstrap/lib/Pagination.d.ts b/types/react-bootstrap/lib/Pagination.d.ts
new file mode 100644
index 0000000000..bac21f5a60
--- /dev/null
+++ b/types/react-bootstrap/lib/Pagination.d.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { Sizes, SelectCallback } from 'react-bootstrap';
+
+declare class Pagination extends React.Component<PaginationProps> { }
+declare namespace Pagination { }
+export = Pagination
+
+interface PaginationProps extends React.HTMLProps<Pagination> {
+  activePage?: number;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  boundaryLinks?: boolean;
+  buttonComponentClass?: React.ReactType;
+  ellipsis?: React.ReactNode;
+  first?: React.ReactNode;
+  items?: number;
+  last?: React.ReactNode;
+  maxButtons?: number;
+  next?: React.ReactNode;
+  onSelect?: SelectCallback;
+  prev?: React.ReactNode;
+}
diff --git a/types/react-bootstrap/lib/PaginationButton.d.ts b/types/react-bootstrap/lib/PaginationButton.d.ts
new file mode 100644
index 0000000000..7af5890f54
--- /dev/null
+++ b/types/react-bootstrap/lib/PaginationButton.d.ts
@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+
+declare class PaginationButton extends React.Component<PaginationButtonProps> { }
+declare namespace PaginationButton { }
+export = PaginationButton
+
+interface PaginationButtonProps extends React.HTMLProps<PaginationButton> {
+  componentClass?: React.ReactType;
+  className?: string;
+  eventKey?: any;
+  onSelect?: SelectCallback;
+  disabled?: boolean;
+  active?: boolean;
+  onClick: React.MouseEventHandler<{}>;
+}
diff --git a/types/react-bootstrap/lib/Panel.d.ts b/types/react-bootstrap/lib/Panel.d.ts
new file mode 100644
index 0000000000..ed30a629b8
--- /dev/null
+++ b/types/react-bootstrap/lib/Panel.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { TransitionCallbacks, Sizes, SelectCallback } from 'react-bootstrap';
+
+declare class Panel extends React.Component<PanelProps> { }
+declare namespace Panel { }
+export = Panel
+
+interface PanelProps extends TransitionCallbacks, React.HTMLProps<Panel> {
+  bsClass?: string;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  collapsible?: boolean;
+  defaultExpanded?: boolean;
+  eventKey?: any;
+  expanded?: boolean;
+  footer?: React.ReactNode;
+  header?: React.ReactNode;
+  onSelect?: SelectCallback;
+}
diff --git a/types/react-bootstrap/lib/PanelGroup.d.ts b/types/react-bootstrap/lib/PanelGroup.d.ts
new file mode 100644
index 0000000000..2b30272c71
--- /dev/null
+++ b/types/react-bootstrap/lib/PanelGroup.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { Sizes, SelectCallback } from 'react-bootstrap';
+
+declare class PanelGroup extends React.Component<PanelGroupProps> { }
+declare namespace PanelGroup { }
+export = PanelGroup
+
+interface PanelGroupProps extends React.HTMLProps<PanelGroup> {
+  accordion?: boolean;
+  activeKey?: any;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  defaultActiveKey?: any;
+  onSelect?: SelectCallback;
+}
diff --git a/types/react-bootstrap/lib/Popover.d.ts b/types/react-bootstrap/lib/Popover.d.ts
new file mode 100644
index 0000000000..6ec31daac1
--- /dev/null
+++ b/types/react-bootstrap/lib/Popover.d.ts
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Popover extends React.Component<PopoverProps> { }
+declare namespace Popover { }
+export = Popover
+
+interface PopoverProps extends React.HTMLProps<Popover> {
+  // Optional
+  arrowOffsetLeft?: number | string;
+  arrowOffsetTop?: number | string;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  placement?: string;
+  positionLeft?: number | string; // String support added since v0.30.0
+  positionTop?: number | string; // String support added since v0.30.0
+}
diff --git a/types/react-bootstrap/lib/ProgressBar.d.ts b/types/react-bootstrap/lib/ProgressBar.d.ts
new file mode 100644
index 0000000000..1a367e151c
--- /dev/null
+++ b/types/react-bootstrap/lib/ProgressBar.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class ProgressBar extends React.Component<ProgressBarProps> { }
+declare namespace ProgressBar { }
+export = ProgressBar
+
+interface ProgressBarProps extends React.HTMLProps<ProgressBar> {
+  // Optional
+  active?: boolean;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  interpolatedClass?: any; // TODO: Add more specific type
+  max?: number;
+  min?: number;
+  now?: number;
+  srOnly?: boolean;
+  striped?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Radio.d.ts b/types/react-bootstrap/lib/Radio.d.ts
new file mode 100644
index 0000000000..1c36b84c1f
--- /dev/null
+++ b/types/react-bootstrap/lib/Radio.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+declare class Radio extends React.Component<RadioProps> { }
+declare namespace Radio { }
+export = Radio
+
+interface RadioProps extends React.HTMLProps<Radio> {
+  bsClass?: string;
+  disabled?: boolean;
+  inline?: boolean;
+  inputRef?: (instance: HTMLInputElement) => void;
+  validationState?: "success" | "warning" | "error";
+}
diff --git a/types/react-bootstrap/lib/ResponsiveEmbed.d.ts b/types/react-bootstrap/lib/ResponsiveEmbed.d.ts
new file mode 100644
index 0000000000..e4b2e6afa0
--- /dev/null
+++ b/types/react-bootstrap/lib/ResponsiveEmbed.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+declare class ResponsiveEmbed extends React.Component<ResponsiveEmbedProps> { }
+declare namespace ResponsiveEmbed { }
+export = ResponsiveEmbed
+
+interface ResponsiveEmbedProps extends React.HTMLProps<ResponsiveEmbed> {
+  a16by9?: boolean;
+  a4by3?: boolean;
+  bsClass?: string;
+}
diff --git a/types/react-bootstrap/lib/Row.d.ts b/types/react-bootstrap/lib/Row.d.ts
new file mode 100644
index 0000000000..1ab48a2f57
--- /dev/null
+++ b/types/react-bootstrap/lib/Row.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare class Row extends React.Component<RowProps> { }
+declare namespace Row { }
+export = Row
+
+interface RowProps extends React.HTMLProps<Row> {
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/SafeAnchor.d.ts b/types/react-bootstrap/lib/SafeAnchor.d.ts
new file mode 100644
index 0000000000..e8b37a547f
--- /dev/null
+++ b/types/react-bootstrap/lib/SafeAnchor.d.ts
@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+declare class SafeAnchor extends React.Component<SafeAnchorProps> { }
+declare namespace SafeAnchor { }
+export = SafeAnchor
+
+interface SafeAnchorProps extends React.HTMLProps<SafeAnchor> {
+  href?: string;
+  onClick?: React.MouseEventHandler<{}>;
+  disabled?: boolean;
+  role?: string;
+  componentClass?: React.ReactType;
+}
diff --git a/types/react-bootstrap/lib/SplitButton.d.ts b/types/react-bootstrap/lib/SplitButton.d.ts
new file mode 100644
index 0000000000..f6432cee6f
--- /dev/null
+++ b/types/react-bootstrap/lib/SplitButton.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class SplitButton extends React.Component<SplitButtonProps> { }
+declare namespace SplitButton { }
+export = SplitButton
+
+interface SplitButtonProps extends React.HTMLProps<SplitButton> {
+  bsStyle?: string;
+  bsSize?: Sizes;
+  dropdownTitle?: any; // TODO: Add more specific type
+  dropup?: boolean;
+  pullRight?: boolean;
+}
diff --git a/types/react-bootstrap/lib/SplitToggle.d.ts b/types/react-bootstrap/lib/SplitToggle.d.ts
new file mode 100644
index 0000000000..2d4a0163f9
--- /dev/null
+++ b/types/react-bootstrap/lib/SplitToggle.d.ts
@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { DropdownToggleProps } from './DropdownToggle';
+
+declare class SplitToggle extends React.Component<SplitToggleProps> { }
+declare namespace SplitToggle { }
+export = SplitToggle
+interface SplitToggleProps extends DropdownToggleProps, React.HTMLProps<SplitToggle> { }
diff --git a/types/react-bootstrap/lib/Tab.d.ts b/types/react-bootstrap/lib/Tab.d.ts
new file mode 100644
index 0000000000..ed6d337670
--- /dev/null
+++ b/types/react-bootstrap/lib/Tab.d.ts
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { TransitionCallbacks } from 'react-bootstrap';
+import * as TabContainer from './TabContainer';
+import * as TabPane from './TabPane';
+import * as TabContent from './TabContent';
+
+declare class Tab extends React.Component<TabProps> {
+  public static Container: typeof TabContainer;
+  public static Content: typeof TabContent;
+  public static Pane: typeof TabPane;
+}
+declare namespace Tab { }
+export = Tab
+
+interface TabProps extends TransitionCallbacks, React.HTMLProps<Tab> {
+  animation?: boolean;
+  'aria-labelledby'?: string;
+  bsClass?: string;
+  eventKey?: any; // TODO: Add more specific type
+  unmountOnExit?: boolean;
+  tabClassName?: string;
+}
diff --git a/types/react-bootstrap/lib/TabContainer.d.ts b/types/react-bootstrap/lib/TabContainer.d.ts
new file mode 100644
index 0000000000..b9cfb776dc
--- /dev/null
+++ b/types/react-bootstrap/lib/TabContainer.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+declare class TabContainer extends React.Component<TabContainerProps> { }
+declare namespace TabContainer { }
+export = TabContainer
+
+interface TabContainerProps extends React.HTMLAttributes<TabContainer> {
+  activeKey?: any;
+  defaultActiveKey?: any;
+  generateChildId?: (eventKey: any, type: any) => string;
+}
diff --git a/types/react-bootstrap/lib/TabContent.d.ts b/types/react-bootstrap/lib/TabContent.d.ts
new file mode 100644
index 0000000000..3b089a3eb9
--- /dev/null
+++ b/types/react-bootstrap/lib/TabContent.d.ts
@@ -0,0 +1,12 @@
+import * as React from 'react';
+
+declare class TabContent extends React.Component<TabContentProps> { }
+declare namespace TabContent { }
+export = TabContent
+
+interface TabContentProps extends React.HTMLProps<TabContent> {
+  componentClass?: React.ReactType,
+  animation?: boolean | React.ReactType;
+  mountOnEnter?: boolean;
+  unmountOnExit?: boolean;
+}
diff --git a/types/react-bootstrap/lib/TabPane.d.ts b/types/react-bootstrap/lib/TabPane.d.ts
new file mode 100644
index 0000000000..5e38defdc8
--- /dev/null
+++ b/types/react-bootstrap/lib/TabPane.d.ts
@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { TransitionCallbacks } from 'react-bootstrap';
+
+declare class TabPane extends React.Component<TabPaneProps> { }
+declare namespace TabPane { }
+export = TabPane
+
+interface TabPaneProps extends TransitionCallbacks, React.HTMLProps<TabPane> {
+  animation?: boolean | React.ComponentClass<any>;
+  'aria-labelledby'?: string;
+  bsClass?: string;
+  eventKey?: any;
+  unmountOnExit?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Table.d.ts b/types/react-bootstrap/lib/Table.d.ts
new file mode 100644
index 0000000000..01c26b0b67
--- /dev/null
+++ b/types/react-bootstrap/lib/Table.d.ts
@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+declare class Table extends React.Component<TableProps> { }
+declare namespace Table { }
+export = Table
+
+interface TableProps extends React.HTMLProps<Table> {
+  bordered?: boolean;
+  condensed?: boolean;
+  hover?: boolean;
+  responsive?: boolean;
+  striped?: boolean;
+  fill?: boolean;
+  bsClass?: string;
+}
diff --git a/types/react-bootstrap/lib/Tabs.d.ts b/types/react-bootstrap/lib/Tabs.d.ts
new file mode 100644
index 0000000000..7d8830201d
--- /dev/null
+++ b/types/react-bootstrap/lib/Tabs.d.ts
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import { SelectCallback } from 'react-bootstrap';
+
+declare class Tabs extends React.Component<TabsProps> { }
+declare namespace Tabs { }
+export = Tabs
+
+interface TabsProps extends React.HTMLProps<Tabs> {
+  activeKey?: any;
+  animation?: boolean;
+  bsStyle?: string;
+  defaultActiveKey?: any;
+  onSelect?: SelectCallback;
+  paneWidth?: any; // TODO: Add more specific type
+  position?: string;
+  tabWidth?: any; // TODO: Add more specific type
+  unmountOnExit?: boolean;
+  justified?: boolean;
+}
diff --git a/types/react-bootstrap/lib/Thumbnail.d.ts b/types/react-bootstrap/lib/Thumbnail.d.ts
new file mode 100644
index 0000000000..5a2adc56ea
--- /dev/null
+++ b/types/react-bootstrap/lib/Thumbnail.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Thumbnail extends React.Component<ThumbnailProps> { }
+declare namespace Thumbnail { }
+export = Thumbnail
+
+interface ThumbnailProps extends React.HTMLProps<Thumbnail> {
+  bsSize?: Sizes;
+  bsStyle?: string;
+}
diff --git a/types/react-bootstrap/lib/Tooltip.d.ts b/types/react-bootstrap/lib/Tooltip.d.ts
new file mode 100644
index 0000000000..996e4789bc
--- /dev/null
+++ b/types/react-bootstrap/lib/Tooltip.d.ts
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Tooltip extends React.Component<TooltipProps> { }
+declare namespace Tooltip { }
+export = Tooltip
+
+interface TooltipProps extends React.HTMLProps<Tooltip> {
+  // Optional
+  arrowOffsetLeft?: number | string;
+  arrowOffsetTop?: number | string;
+  bsSize?: Sizes;
+  bsStyle?: string;
+  placement?: string;
+  positionLeft?: number;
+  positionTop?: number;
+}
diff --git a/types/react-bootstrap/lib/Well.d.ts b/types/react-bootstrap/lib/Well.d.ts
new file mode 100644
index 0000000000..5c196a67e6
--- /dev/null
+++ b/types/react-bootstrap/lib/Well.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+import { Sizes } from 'react-bootstrap';
+
+declare class Well extends React.Component<WellProps> { }
+declare namespace Well { }
+export = Well
+
+interface WellProps extends React.HTMLProps<Well> {
+  bsSize?: Sizes;
+  bsStyle?: string;
+}
diff --git a/types/react-bootstrap/lib/index.d.ts b/types/react-bootstrap/lib/index.d.ts
new file mode 100644
index 0000000000..28078e1bcd
--- /dev/null
+++ b/types/react-bootstrap/lib/index.d.ts
@@ -0,0 +1,178 @@
+import * as Accordion from './Accordion';
+import * as Alert from './Alert';
+import * as Badge from './Badge';
+import * as Breadcrumb from './Breadcrumb';
+import * as BreadcrumbItem from './BreadcrumbItem';
+import * as Button from './Button';
+import * as ButtonGroup from './ButtonGroup';
+import * as ButtonToolbar from './ButtonToolbar';
+import * as Carousel from './Carousel';
+import * as CarouselCaption from './CarouselCaption';
+import * as CarouselItem from './CarouselItem';
+import * as Checkbox from './Checkbox';
+import * as Clearfix from './Clearfix';
+import * as Col from './Col';
+import * as Collapse from './Collapse';
+import * as ControlLabel from './ControlLabel';
+import * as Dropdown from './Dropdown';
+import * as DropdownButton from './DropdownButton';
+import * as DropdownMenu from './DropdownMenu';
+import * as DropdownToggle from './DropdownToggle';
+import * as Fade from './Fade';
+import * as Form from './Form';
+import * as FormControl from './FormControl';
+import * as FormControlFeedback from './FormControlFeedback';
+import * as FormControlStatic from './FormControlStatic';
+import * as FormGroup from './FormGroup';
+import * as Glyphicon from './Glyphicon';
+import * as Grid from './Grid';
+import * as HelpBlock from './HelpBlock';
+import * as Image from './Image';
+import * as InputGroup from './InputGroup';
+import * as InputGroupAddon from './InputGroupAddon';
+import * as InputGroupButton from './InputGroupButton';
+import * as Jumbotron from './Jumbotron';
+import * as Label from './Label';
+import * as ListGroup from './ListGroup';
+import * as ListGroupItem from './ListGroupItem';
+import * as Media from './Media';
+import * as MediaBody from './MediaBody';
+import * as MediaHeading from './MediaHeading';
+import * as MediaLeft from './MediaLeft';
+import * as MediaList from './MediaList';
+import * as MediaListItem from './MediaListItem';
+import * as MediaRight from './MediaRight';
+import * as MenuItem from './MenuItem';
+import * as Modal from './Modal';
+import * as ModalBody from './ModalBody';
+import * as ModalDialog from './ModalDialog';
+import * as ModalFooter from './ModalFooter';
+import * as ModalHeader from './ModalHeader';
+import * as ModalTitle from './ModalTitle';
+import * as Nav from './Nav';
+import * as Navbar from './Navbar';
+import * as NavbarBrand from './NavbarBrand';
+import * as NavbarCollapse from './NavbarCollapse';
+import * as NavbarHeader from './NavbarHeader';
+import * as NavbarToggle from './NavbarToggle';
+import * as NavDropdown from './NavDropdown';
+import * as NavItem from './NavItem';
+import * as Overlay from './Overlay';
+import * as OverlayTrigger from './OverlayTrigger';
+import * as PageHeader from './PageHeader';
+import * as PageItem from './PageItem';
+import * as Pager from './Pager';
+import * as PagerItem from './PagerItem';
+import * as Pagination from './Pagination';
+import * as PaginationButton from './PaginationButton';
+import * as Panel from './Panel';
+import * as PanelGroup from './PanelGroup';
+import * as Popover from './Popover';
+import * as ProgressBar from './ProgressBar';
+import * as Radio from './Radio';
+import * as ResponsiveEmbed from './ResponsiveEmbed';
+import * as Row from './Row';
+import * as SafeAnchor from './SafeAnchor';
+import * as SplitButton from './SplitButton';
+import * as SplitToggle from './SplitToggle';
+import * as Tab from './Tab';
+import * as TabContainer from './TabContainer';
+import * as TabContent from './TabContent';
+import * as Table from './Table';
+import * as TabPane from './TabPane';
+import * as Tabs from './Tabs';
+import * as Thumbnail from './Thumbnail';
+import * as Tooltip from './Tooltip';
+import * as Well from './Well';
+
+import * as utils from './utils';
+
+export {
+  Accordion,
+  Alert,
+  Badge,
+  Breadcrumb,
+  BreadcrumbItem,
+  Button,
+  ButtonGroup,
+  ButtonToolbar,
+  Carousel,
+  CarouselCaption,
+  CarouselItem,
+  Checkbox,
+  Clearfix,
+  Col,
+  Collapse,
+  ControlLabel,
+  Dropdown,
+  DropdownButton,
+  DropdownMenu,
+  DropdownToggle,
+  Fade,
+  Form,
+  FormControl,
+  FormControlFeedback,
+  FormControlStatic,
+  FormGroup,
+  Glyphicon,
+  Grid,
+  HelpBlock,
+  Image,
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  Jumbotron,
+  Label,
+  ListGroup,
+  ListGroupItem,
+  Media,
+  MediaBody,
+  MediaHeading,
+  MediaLeft,
+  MediaList,
+  MediaListItem,
+  MediaRight,
+  MenuItem,
+  Modal,
+  ModalBody,
+  ModalDialog,
+  ModalFooter,
+  ModalHeader,
+  ModalTitle,
+  Nav,
+  Navbar,
+  NavbarBrand,
+  NavbarCollapse,
+  NavbarHeader,
+  NavbarToggle,
+  NavDropdown,
+  NavItem,
+  Overlay,
+  OverlayTrigger,
+  PageHeader,
+  PageItem,
+  Pager,
+  PagerItem,
+  Pagination,
+  PaginationButton,
+  Panel,
+  PanelGroup,
+  Popover,
+  ProgressBar,
+  Radio,
+  ResponsiveEmbed,
+  Row,
+  SafeAnchor,
+  SplitButton,
+  SplitToggle,
+  Tab,
+  TabContainer,
+  TabContent,
+  Table,
+  TabPane,
+  Tabs,
+  Thumbnail,
+  Tooltip,
+  Well,
+  utils,
+}
diff --git a/types/react-bootstrap/lib/utils/PropTypes.d.ts b/types/react-bootstrap/lib/utils/PropTypes.d.ts
new file mode 100644
index 0000000000..3b439c034a
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/PropTypes.d.ts
@@ -0,0 +1,2 @@
+export function requiredRoles(...roles: any[]): any;
+export function exclusiveRoles(...roles: any[]): any;
diff --git a/types/react-bootstrap/lib/utils/StyleConfig.d.ts b/types/react-bootstrap/lib/utils/StyleConfig.d.ts
new file mode 100644
index 0000000000..811b01f60f
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/StyleConfig.d.ts
@@ -0,0 +1,32 @@
+export const Size: {
+  LARGE: string;
+  SMALL: string;
+  XSMALL: string;
+};
+
+export const SIZE_MAP: {
+  large: string;
+  medium: string;
+  small: string;
+  xsmall: string;
+  lg: string;
+  md: string;
+  sm: string;
+  xs: string;
+};
+
+export const DEVICE_SIZES: string[];
+
+export const State: {
+  SUCCESS: string;
+  WARNING: string;
+  DANGER: string;
+  INFO: string;
+};
+
+export const Style: {
+  DEFAULT: string;
+  PRIMARY: string;
+  LINK: string;
+  INVERSE: string;
+};
diff --git a/types/react-bootstrap/lib/utils/bootstrapUtils.d.ts b/types/react-bootstrap/lib/utils/bootstrapUtils.d.ts
new file mode 100644
index 0000000000..9b74f9da55
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/bootstrapUtils.d.ts
@@ -0,0 +1,18 @@
+interface BSProps {
+  bsClass: any;
+  bsSize: any;
+  bsStyle: any;
+  bsRole: any;
+}
+
+export function prefix(props: { bsClass?: any }, variant?: string): string;
+export function bsClass(defaultClass: any, Component: any): any;
+export function bsStyles(styles: any, defaultStyle: any, Component: any): any;
+export function bsSizes(sizes: any, defaultSize: any, Component: any): any;
+export function getClassSet(props: any): any;
+export function getBsProps(props: any): BSProps;
+export function isBsProp(propName: string): boolean;
+export function splitBsProps(props: any): [BSProps, any];
+export function splitBsPropsAndOmit(props: any, omittedPropNames: any): [BSProps, any];
+export function addStyle(Component: any, ...styleVariant: any[]): any;
+// TODO: export function _curry
diff --git a/types/react-bootstrap/lib/utils/capitalize.d.ts b/types/react-bootstrap/lib/utils/capitalize.d.ts
new file mode 100644
index 0000000000..3fc792144b
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/capitalize.d.ts
@@ -0,0 +1 @@
+export default function capitalize(string: string): string;
diff --git a/types/react-bootstrap/lib/utils/createChainedFunction.d.ts b/types/react-bootstrap/lib/utils/createChainedFunction.d.ts
new file mode 100644
index 0000000000..b45a46c61e
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/createChainedFunction.d.ts
@@ -0,0 +1 @@
+export default function createChainedFunction(...funcs: Function[]): Function;
diff --git a/types/react-bootstrap/lib/utils/deprecationWarning.d.ts b/types/react-bootstrap/lib/utils/deprecationWarning.d.ts
new file mode 100644
index 0000000000..c7a6e380d8
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/deprecationWarning.d.ts
@@ -0,0 +1,3 @@
+export default function deprecationWarning(oldname: any, newname: string, link?: string): void;
+export function wrapper(Component: any, ...args: any[]): any;
+export function _resetWarned(): void;
diff --git a/types/react-bootstrap/lib/utils/index.d.ts b/types/react-bootstrap/lib/utils/index.d.ts
new file mode 100644
index 0000000000..22655828b6
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/index.d.ts
@@ -0,0 +1,4 @@
+import * as bootstrapUtils from './bootstrapUtils';
+import createChainedFunction from './createChainedFunction';
+
+export { createChainedFunction, bootstrapUtils }
diff --git a/types/react-bootstrap/lib/utils/splitComponentProps.d.ts b/types/react-bootstrap/lib/utils/splitComponentProps.d.ts
new file mode 100644
index 0000000000..ca761b0b62
--- /dev/null
+++ b/types/react-bootstrap/lib/utils/splitComponentProps.d.ts
@@ -0,0 +1 @@
+export default function splitComponentProps(props: any, Component: any): [any, any];
diff --git a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
new file mode 100644
index 0000000000..00f3920224
--- /dev/null
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -0,0 +1,193 @@
+import * as React from 'react';
+import * as Accordion from 'react-bootstrap/lib/Accordion';
+import * as Alert from 'react-bootstrap/lib/Alert';
+import * as Badge from 'react-bootstrap/lib/Badge';
+import * as Breadcrumb from 'react-bootstrap/lib/Breadcrumb';
+import * as BreadcrumbItem from 'react-bootstrap/lib/BreadcrumbItem';
+import * as Button from 'react-bootstrap/lib/Button';
+import * as ButtonGroup from 'react-bootstrap/lib/ButtonGroup';
+import * as ButtonToolbar from 'react-bootstrap/lib/ButtonToolbar';
+import * as Carousel from 'react-bootstrap/lib/Carousel';
+import * as CarouselCaption from 'react-bootstrap/lib/CarouselCaption';
+import * as CarouselItem from 'react-bootstrap/lib/CarouselItem';
+import * as Checkbox from 'react-bootstrap/lib/Checkbox';
+import * as Clearfix from 'react-bootstrap/lib/Clearfix';
+import * as Col from 'react-bootstrap/lib/Col';
+import * as Collapse from 'react-bootstrap/lib/Collapse';
+import * as ControlLabel from 'react-bootstrap/lib/ControlLabel';
+import * as Dropdown from 'react-bootstrap/lib/Dropdown';
+import * as DropdownButton from 'react-bootstrap/lib/DropdownButton';
+import * as DropdownMenu from 'react-bootstrap/lib/DropdownMenu';
+import * as DropdownToggle from 'react-bootstrap/lib/DropdownToggle';
+import * as Fade from 'react-bootstrap/lib/Fade';
+import * as Form from 'react-bootstrap/lib/Form';
+import * as FormControl from 'react-bootstrap/lib/FormControl';
+import * as FormControlFeedback from 'react-bootstrap/lib/FormControlFeedback';
+import * as FormControlStatic from 'react-bootstrap/lib/FormControlStatic';
+import * as FormGroup from 'react-bootstrap/lib/FormGroup';
+import * as Glyphicon from 'react-bootstrap/lib/Glyphicon';
+import * as Grid from 'react-bootstrap/lib/Grid';
+import * as HelpBlock from 'react-bootstrap/lib/HelpBlock';
+import * as Image from 'react-bootstrap/lib/Image';
+import * as InputGroup from 'react-bootstrap/lib/InputGroup';
+import * as InputGroupAddon from 'react-bootstrap/lib/InputGroupAddon';
+import * as InputGroupButton from 'react-bootstrap/lib/InputGroupButton';
+import * as Jumbotron from 'react-bootstrap/lib/Jumbotron';
+import * as Label from 'react-bootstrap/lib/Label';
+import * as ListGroup from 'react-bootstrap/lib/ListGroup';
+import * as ListGroupItem from 'react-bootstrap/lib/ListGroupItem';
+import * as Media from 'react-bootstrap/lib/Media';
+import * as MediaBody from 'react-bootstrap/lib/MediaBody';
+import * as MediaHeading from 'react-bootstrap/lib/MediaHeading';
+import * as MediaLeft from 'react-bootstrap/lib/MediaLeft';
+import * as MediaList from 'react-bootstrap/lib/MediaList';
+import * as MediaListItem from 'react-bootstrap/lib/MediaListItem';
+import * as MediaRight from 'react-bootstrap/lib/MediaRight';
+import * as MenuItem from 'react-bootstrap/lib/MenuItem';
+import * as Modal from 'react-bootstrap/lib/Modal';
+import * as ModalBody from 'react-bootstrap/lib/ModalBody';
+import * as ModalDialog from 'react-bootstrap/lib/ModalDialog';
+import * as ModalFooter from 'react-bootstrap/lib/ModalFooter';
+import * as ModalHeader from 'react-bootstrap/lib/ModalHeader';
+import * as ModalTitle from 'react-bootstrap/lib/ModalTitle';
+import * as Nav from 'react-bootstrap/lib/Nav';
+import * as NavDropdown from 'react-bootstrap/lib/NavDropdown';
+import * as NavItem from 'react-bootstrap/lib/NavItem';
+import * as Navbar from 'react-bootstrap/lib/Navbar';
+import * as NavbarBrand from 'react-bootstrap/lib/NavbarBrand';
+import * as NavbarCollapse from 'react-bootstrap/lib/NavbarCollapse';
+import * as NavbarHeader from 'react-bootstrap/lib/NavbarHeader';
+import * as NavbarToggle from 'react-bootstrap/lib/NavbarToggle';
+import * as Overlay from 'react-bootstrap/lib/Overlay';
+import * as OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
+import * as PageHeader from 'react-bootstrap/lib/PageHeader';
+import * as PageItem from 'react-bootstrap/lib/PageItem';
+import * as Pager from 'react-bootstrap/lib/Pager';
+import * as PagerItem from 'react-bootstrap/lib/PagerItem';
+import * as Pagination from 'react-bootstrap/lib/Pagination';
+import * as PaginationButton from 'react-bootstrap/lib/PaginationButton';
+import * as Panel from 'react-bootstrap/lib/Panel';
+import * as PanelGroup from 'react-bootstrap/lib/PanelGroup';
+import * as Popover from 'react-bootstrap/lib/Popover';
+import * as ProgressBar from 'react-bootstrap/lib/ProgressBar';
+import * as Radio from 'react-bootstrap/lib/Radio';
+import * as ResponsiveEmbed from 'react-bootstrap/lib/ResponsiveEmbed';
+import * as Row from 'react-bootstrap/lib/Row';
+import * as SafeAnchor from 'react-bootstrap/lib/SafeAnchor';
+import * as SplitButton from 'react-bootstrap/lib/SplitButton';
+import * as SplitToggle from 'react-bootstrap/lib/SplitToggle';
+import * as Tab from 'react-bootstrap/lib/Tab';
+import * as TabContainer from 'react-bootstrap/lib/TabContainer';
+import * as TabContent from 'react-bootstrap/lib/TabContent';
+import * as TabPane from 'react-bootstrap/lib/TabPane';
+import * as Table from 'react-bootstrap/lib/Table';
+import * as Tabs from 'react-bootstrap/lib/Tabs';
+import * as Thumbnail from 'react-bootstrap/lib/Thumbnail';
+import * as Tooltip from 'react-bootstrap/lib/Tooltip';
+import * as Well from 'react-bootstrap/lib/Well';
+
+const noop = () => {};
+
+/**
+ * Mostly just checking here that TS recognizes all of the imports as Components,
+ * which means we properly exported them from lib
+ */
+
+export class ReactBootstrapIndividualComponentsTest extends React.Component {
+  render() {
+    return (
+      <div>
+        <Accordion />
+        <Alert />
+        <Badge />
+        <Breadcrumb>
+          <BreadcrumbItem />
+        </Breadcrumb>
+        <Button />
+        <ButtonGroup><Button /></ButtonGroup>
+        <ButtonToolbar><Button /></ButtonToolbar>
+        <Carousel>
+          <CarouselCaption />
+          <Carousel.Caption />
+          <CarouselItem />
+          <Carousel.Item />
+        </Carousel>
+        <Checkbox />
+        <Clearfix />
+        <Col />
+        <Collapse />
+        <ControlLabel />
+        <Dropdown id="foo" />
+        <DropdownButton id="foo" />
+        <DropdownMenu />
+        <DropdownToggle />
+        <Fade />
+        <Form />
+        <FormControl />
+        <FormControlFeedback />
+        <FormControlStatic />
+        <FormGroup />
+        <Glyphicon glyph="foo" />
+        <Grid />
+        <HelpBlock />
+        <Image />
+        <InputGroup />
+        <InputGroupAddon />
+        <InputGroupButton />
+        <Jumbotron />
+        <Label />
+        <ListGroup />
+        <ListGroupItem />
+        <Media />
+        <MediaBody />
+        <MediaHeading />
+        <MediaLeft />
+        <MediaList />
+        <MediaListItem />
+        <MediaRight />
+        <MenuItem />
+        <Modal onHide={noop} />
+        <ModalBody />
+        <ModalDialog />
+        <ModalFooter />
+        <ModalHeader />
+        <ModalTitle />
+        <Nav />
+        <NavDropdown id="foo" />
+        <NavItem />
+        <Navbar />
+        <NavbarBrand />
+        <NavbarCollapse />
+        <NavbarHeader />
+        <NavbarToggle />
+        <Overlay />
+        <OverlayTrigger overlay="" />
+        <PageHeader />
+        <PageItem />
+        <Pager />
+        <PagerItem />
+        <Pagination />
+        <PaginationButton onClick={noop} />
+        <Panel />
+        <PanelGroup />
+        <Popover />
+        <ProgressBar />
+        <Radio />
+        <ResponsiveEmbed />
+        <Row />
+        <SafeAnchor />
+        <SplitButton />
+        <SplitToggle />
+        <Tab />
+        <TabContainer />
+        <TabContent />
+        <TabPane />
+        <Table />
+        <Tabs />
+        <Thumbnail />
+        <Tooltip />
+        <Well />
+      </div>
+    );
+  }
+}
diff --git a/types/react-bootstrap/react-bootstrap-tests.tsx b/types/react-bootstrap/test/react-bootstrap-tests.tsx
similarity index 93%
rename from types/react-bootstrap/react-bootstrap-tests.tsx
rename to types/react-bootstrap/test/react-bootstrap-tests.tsx
index c93628c7b6..76570b44c0 100644
--- a/types/react-bootstrap/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-tests.tsx
@@ -15,13 +15,12 @@ import {
     Radio, Checkbox, Media, InputGroup
 } from 'react-bootstrap';
 
-
 export class ReactBootstrapTest extends Component {
     callback() {
         alert('Callback: ' + JSON.stringify(arguments));
     }
 
-    public render() {
+    render() {
         let style: CSSProperties = { padding: '50px' };
         let tooltip = (<Tooltip><strong>Holy guacamole!</strong> Check this info.</Tooltip>);
 
@@ -37,6 +36,12 @@ export class ReactBootstrapTest extends Component {
 
         return (
             <div style={style}>
+                { innerGlyphicon }
+                { innerButton }
+                { innerDropdown }
+                { innerRadio }
+                { innerCheckbox }
+
                 <div style={style}>
                     <ButtonToolbar>
                         <Button>Default</Button>
@@ -82,7 +87,6 @@ export class ReactBootstrapTest extends Component {
                     </ButtonToolbar>
                 </div>
 
-
                 <div style={style}>
                     <ButtonToolbar>
                         <Button href='#'>Link</Button>
@@ -90,7 +94,6 @@ export class ReactBootstrapTest extends Component {
                     </ButtonToolbar>
                 </div>
 
-
                 <div style={style}>
                     <ButtonGroup>
                         <Button>Left</Button>
@@ -300,15 +303,12 @@ export class ReactBootstrapTest extends Component {
                 <div style={style}>
                   <Accordion>
                     <Panel header='Collapsible Group Item #1' eventKey='1'>
-                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
                 farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
                     </Panel>
                     <Panel header='Collapsible Group Item #2' eventKey='2'>
-                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
                 farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
                     </Panel>
                     <Panel header='Collapsible Group Item #3' eventKey='3'>
-                      Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer
                 farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
                     </Panel>
                   </Accordion>
@@ -316,7 +316,15 @@ export class ReactBootstrapTest extends Component {
 
                 <div style={style}>
                   <div className='static-modal'>
-                    <Modal.Dialog onHide={this.callback} onEnter={this.callback} onEntered={this.callback} onEntering={this.callback} onExit={this.callback} onExited={this.callback} onExiting={this.callback}>
+                    <Modal.Dialog
+                      onHide={this.callback}
+                      onEnter={this.callback}
+                      onEntered={this.callback}
+                      onEntering={this.callback}
+                      onExit={this.callback}
+                      onExited={this.callback}
+                      onExiting={this.callback}
+                    >
                       <Modal.Header>
                         <Modal.Title>Modal title</Modal.Title>
                       </Modal.Header>
@@ -351,15 +359,6 @@ export class ReactBootstrapTest extends Component {
                             <hr />
 
                             <h4>Overflowing text to show scroll behavior</h4>
-                            <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
-                            <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
-                            <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
-                            <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
-                            <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
-                            <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
-                            <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
-                            <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
-                            <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
                         </Modal.Body>
                         <Modal.Footer>
                             <Button onClick={() => ({})}>Close</Button>
@@ -605,7 +604,7 @@ export class ReactBootstrapTest extends Component {
                      onEntering={() => {}}
                      onExit={() => {}}
                      onExited={() => {}}
-                     onExiting={()=>{}}
+                     onExiting={() => {}}
                      unmountOnExit={true}
                      bsClass="some style" tabClassName="classname"  eventKey={1} title='Tab 1'>Tab 1 content</Tab>
                     <Tab eventKey={2} title='Tab 2'>Tab 2 content</Tab>
@@ -686,7 +685,7 @@ export class ReactBootstrapTest extends Component {
 
                 <div style={style}>
                     <Pagination
-                      buttonComponentClass={( props:any ) =>
+                      buttonComponentClass={( props: any ) =>
                           <SafeAnchor href="/test" disabled role="role"/>
                       }
                       maxButtons={10}/>
@@ -1266,7 +1265,7 @@ export class ReactBootstrapTest extends Component {
                   </Media.Left>
                   <Media.Body>
                     <Media.Heading>Top aligned media</Media.Heading>
-                    <p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
+                    <p>Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.</p>
                     <p>Donec sed odio dui. Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
                   </Media.Body>
                 </Media>
diff --git a/types/react-bootstrap/tsconfig.json b/types/react-bootstrap/tsconfig.json
index e4ea90fda2..eb50273e85 100644
--- a/types/react-bootstrap/tsconfig.json
+++ b/types/react-bootstrap/tsconfig.json
@@ -15,10 +15,17 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "noUnusedLocals": false
     },
     "files": [
         "index.d.ts",
-        "react-bootstrap-tests.tsx"
+        "lib/utils/capitalize.d.ts",
+        "test/react-bootstrap-tests.tsx",
+        "test/react-bootstrap-individual-components-tests.tsx",
+        "lib/utils/deprecationWarning.d.ts",
+        "lib/utils/PropTypes.d.ts",
+        "lib/utils/splitComponentProps.d.ts",
+        "lib/utils/StyleConfig.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-bootstrap/tslint.json b/types/react-bootstrap/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-bootstrap/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}